Remove old interval code

Author: acffordyce973

app/src/main/java/com/arks_layer/pso2_alert/MainActivity.java

@@ -3,6 +3,7 @@
 import static android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS;
 import static android.provider.Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM;
 
+import android.annotation.SuppressLint;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
 import android.app.PendingIntent;
@@ -24,9 +25,6 @@
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -181,7 +179,7 @@ private void configureUnoptimised()
         alert.setNeutralButton("Ok", (dialog, whichButton) -> {
             showToast(context, getString(R.string.toast_message_battery), Toast.LENGTH_LONG);
 
-            Intent requestIntent = new Intent(ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+            @SuppressLint("BatteryLife") Intent requestIntent = new Intent(ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
             requestIntent.setData(Uri.parse("package:" + packageName));
             startActivity(requestIntent);
         });
@@ -293,7 +291,7 @@ private void getAlertList()
         Log.d("MainActivity", "Using the following server URL at " + serverURL);
 
         //Download data from server
-        String apiData = null;
+        String apiData;
         try {
             apiData = WebHelper.getStringData(new URL(serverURL));
         } catch (Exception e) {
@@ -303,7 +301,6 @@ private void getAlertList()
             return;
         }
         //Split by newline
-        //String[] apiEntries = apiData.split("\\R");
         String[] apiEntries = apiData.split("<br>");
         Log.d("MainActivity", "Received " + apiEntries.length + " alert titles from the Resources API");
 
@@ -352,7 +349,7 @@ private void getAppMessage()
         });
 
         //Download data from server
-        String apiData = null;
+        String apiData;
         try {
             apiData = WebHelper.getStringData(new URL(serverURL));
         } catch (Exception e) {
@@ -398,32 +395,6 @@ private void configureUserSettings()
             lblServersFail.setVisibility(View.VISIBLE);
             lblAlertsFail.setVisibility(View.VISIBLE);
         }
-
-        Spinner settingInterval = findViewById(R.id.settingInterval);
-        ArrayAdapter adapterInterval = ArrayAdapter.createFromResource(this, R.array.intervals, R.layout.spinner_item);
-        adapterInterval.setDropDownViewResource(R.layout.spinner_item_dropdown);
-        settingInterval.setAdapter(adapterInterval);
-        settingInterval.setSelection(adapterInterval.getPosition(String.valueOf(sharedPref.getInt(getString(R.string.setting_interval), 10))), false);
-
-        settingInterval.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                try
-                {
-                    Integer newInterval = Integer.valueOf(String.valueOf(parent.getItemAtPosition(position)));
-                    sharedPref.putInt(getString(R.string.setting_interval), newInterval);
-                    showToast(MainActivity.this, "Check interval has been set to " + newInterval + " minutes!", Toast.LENGTH_LONG);
-                    Log.i("MainActivity", "Check interval has been set to " + newInterval + " minutes");
-                }
-                catch (Exception e)
-                {
-                    Log.e("MainActivity", "Setting Interval: " + e.getMessage());
-                    e.printStackTrace();
-                }
-            }
-            @Override
-            public void onNothingSelected(AdapterView<?> arg0) { }
-        });
     }
 
     @Override
@@ -439,6 +410,7 @@ protected void onResume() {
         }
     }
 
+    @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/res/layout/activity_main.xml

@@ -31,6 +31,7 @@
         android:layout_height="0dp"
         android:layout_marginBottom="2dp"
         android:clickable="true"
+        android:contentDescription="@string/desc_exit_button"
         app:layout_constraintBottom_toBottomOf="@id/materialToolbar"
         app:layout_constraintEnd_toEndOf="@id/materialToolbar"
         app:layout_constraintHeight="match_constraint"
@@ -110,51 +111,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/materialToolbar" />
 
-            <LinearLayout
-                android:id="@+id/layout_interval"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/lblSettingTimer2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_weight="1"
-                    android:duplicateParentState="false"
-                    android:editable="false"
-                    android:gravity="center|left"
-                    android:text="Check Interval:"
-                    android:textAllCaps="false"
-                    android:textColor="@color/general_text"
-                    android:textSize="20sp"
-                    android:visibility="gone" />
-
-                <Spinner
-                    android:id="@+id/settingInterval"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:backgroundTint="@color/general_text"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:id="@+id/lblSettingMinutes"
-                    android:layout_width="100sp"
-                    android:layout_height="48dp"
-                    android:duplicateParentState="false"
-                    android:editable="false"
-                    android:gravity="center|left"
-                    android:text="minutes"
-                    android:textAlignment="gravity"
-                    android:textAllCaps="false"
-                    android:textColor="#99E3FF"
-                    android:textIsSelectable="false"
-                    android:textSize="20sp"
-                    android:visibility="gone" />
-
-            </LinearLayout>
-
             <TextView
                 android:id="@+id/lblHeaderServers"
                 android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -67,4 +67,6 @@
     <string name="toast_message_alert_list_failed">Failed to download the list of Alerts: %1$s</string>
     <string name="toast_message_manual_check">Manually checking for alerts.</string>
     <string name="toast_message_exit">&appname; will now exit.</string>
+
+    <string name="desc_exit_button">The letter X inside a box</string>
 </resources>