altosdroid: Fix a pile of compile warnings

This deletes code which doesn't do anything in API versions past 21 and
changes a few bits of code to use the newer supported way.

No functional changes are intended...

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java
index e2dfddf7a524f916fa81083cd4efab4f75a0c7a5..46709f0f7f3c9bff417aad335ac6d85270ac08f5 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -699,7 +699,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                mStateView     = (TextView) findViewById(R.id.state_value);
                mAgeView       = (TextView) findViewById(R.id.age_value);
                mAgeNewColor   = mAgeView.getTextColors().getDefaultColor();
                mStateView     = (TextView) findViewById(R.id.state_value);
                mAgeView       = (TextView) findViewById(R.id.age_value);
                mAgeNewColor   = mAgeView.getTextColors().getDefaultColor();

-               mAgeOldColor   = getResources().getColor(R.color.old_color);
+               mAgeOldColor   = getResources().getColor(R.color.old_color, getTheme());

        }
 
        private void ensureBluetooth() {
        }
 
        private void ensureBluetooth() {

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java
index 4f0fb1fa456241975f656e0f992ac667ad63944b..ae7046162e813e6e38a922b7dd5a43886d82f626 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -21,6 +21,7 @@ package org.altusmetrum.AltosDroid;
 import org.altusmetrum.altoslib_13.*;
 import android.location.Location;
 import android.app.Activity;
 import org.altusmetrum.altoslib_13.*;
 import android.location.Location;
 import android.app.Activity;

+import android.content.*;

 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import android.widget.TextView;


@@ -66,9 +67,9 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
        }
 
        @Override
        }
 
        @Override

-       public void onAttach(Activity activity) {
-               super.onAttach(activity);
-               altos_droid = (AltosDroid) activity;
+       public void onAttach(Context context) {
+               super.onAttach(context);
+               altos_droid = (AltosDroid) context;

                altos_droid.registerTab(this);
        }
 
                altos_droid.registerTab(this);
        }
 

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
index c3204336a1a99878b10f0a153abd8de71b71305d..a2b0b25b75cf2da4f9d63d3d4d4fd852109f83a1 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -346,18 +346,6 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
                draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
        }
 
                draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
        }
 

-       @Override public void invalidate() {
-               Rect r = new Rect();
-               getDrawingRect(r);
-               super.invalidate();
-       }
-
-       @Override public void invalidate(int l, int t, int r, int b) {
-               Rect rect = new Rect();
-               getDrawingRect(rect);
-               super.invalidate();
-       }
-

        @Override
        protected void onDraw(Canvas view_canvas) {
                if (map == null) {
        @Override
        protected void onDraw(Canvas view_canvas) {
                if (map == null) {

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java
index 8631023c3a76f9bab278297a5697c443d8c95657..4b907a05194e3c80ce6763364cfd22cb75d1d03b 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -82,7 +82,7 @@ public class AltosVoice {
                if (!tts_enabled) return;
                last_speak_time = now();
                if (!quiet)
                if (!tts_enabled) return;
                last_speak_time = now();
                if (!quiet)

-                       tts.speak(s, TextToSpeech.QUEUE_ADD, null);
+                       tts.speak(s, TextToSpeech.QUEUE_ADD, null, null);

        }
 
        public synchronized long time_since_speak() {
        }
 
        public synchronized long time_since_speak() {

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
index 5a76d52d1af529f28bd16fd2ff63d2489b233258..1c3e1dbab21019bd9bfa82423e820a2129720c00 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -59,7 +59,6 @@ public class DeviceListActivity extends Activity {
                super.onCreate(savedInstanceState);
 
                // Setup the window
                super.onCreate(savedInstanceState);
 
                // Setup the window

-               requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

                setContentView(R.layout.device_list);
 
                // Set result CANCELED incase the user backs out
                setContentView(R.layout.device_list);
 
                // Set result CANCELED incase the user backs out


@@ -136,7 +135,6 @@ public class DeviceListActivity extends Activity {
                AltosDebug.debug("doDiscovery()");
 
                // Indicate scanning in the title
                AltosDebug.debug("doDiscovery()");
 
                // Indicate scanning in the title

-               setProgressBarIndeterminateVisibility(true);

                setTitle(R.string.scanning);
 
                // Turn on sub-title for new devices
                setTitle(R.string.scanning);
 
                // Turn on sub-title for new devices


@@ -208,7 +206,6 @@ public class DeviceListActivity extends Activity {
                        /* When discovery is finished, change the Activity title
                         */
                        } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
                        /* When discovery is finished, change the Activity title
                         */
                        } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {

-                               setProgressBarIndeterminateVisibility(false);

                                setTitle(R.string.select_device);
                                if (mNewDevicesArrayAdapter.getCount() == 0) {
                                        String noDevices = getResources().getText(R.string.none_found).toString();
                                setTitle(R.string.select_device);
                                if (mNewDevicesArrayAdapter.getCount() == 0) {
                                        String noDevices = getResources().getText(R.string.none_found).toString();

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/GoNoGoLights.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/GoNoGoLights.java
index a57758b5b769207b4fced886b53a5cc270d0bf84..717bd2090cc3bf13355e56b0f858e0447d7f7ad2 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/GoNoGoLights.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/GoNoGoLights.java
@@ -41,9 +41,9 @@ public class GoNoGoLights {
                missing = true;
                set = false;
 
                missing = true;
                set = false;
 

-               dRed   = r.getDrawable(R.drawable.redled);
-               dGreen = r.getDrawable(R.drawable.greenled);
-               dGray  = r.getDrawable(R.drawable.grayled);
+               dRed   = in_red.getContext().getDrawable(R.drawable.redled);
+               dGreen = in_red.getContext().getDrawable(R.drawable.greenled);
+               dGray  = in_red.getContext().getDrawable(R.drawable.grayled);

        }
 
        public void set(Boolean s, Boolean m) {
        }
 
        public void set(Boolean s, Boolean m) {

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java
index 14ea814e93148acc7f61567ef654b5d19b69baab..9c786ac4e04dfac39d16465b802407166407f7f7 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java
@@ -78,7 +78,6 @@ public class IdleModeActivity extends Activity {
                super.onCreate(savedInstanceState);
 
                // Setup the window
                super.onCreate(savedInstanceState);
 
                // Setup the window

-               requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

                setContentView(R.layout.idle_mode);
 
                callsign = (EditText) findViewById(R.id.set_callsign);
                setContentView(R.layout.idle_mode);
 
                callsign = (EditText) findViewById(R.id.set_callsign);

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
index 2ae2a3e7415808b684fd85ef1b469960c4e481b7..1011df03c297bd40fb2065da8f2bb51cbe508461 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
@@ -101,7 +101,7 @@ class IgniterAdapter extends ArrayAdapter<IgniterItem> {
                if (position == selected_item)
                        item.igniter_view.setBackgroundColor(Color.RED);
                else
                if (position == selected_item)
                        item.igniter_view.setBackgroundColor(Color.RED);
                else

-                       item.igniter_view.setBackgroundColor(Color.WHITE);
+                       item.igniter_view.setBackgroundColor(0);

                return item.igniter_view;
        }
 }
                return item.igniter_view;
        }
 }


@@ -139,7 +139,8 @@ public class IgniterActivity extends Activity {
 
                        switch (msg.what) {
                        case AltosDroid.MSG_IGNITER_STATUS:
 
                        switch (msg.what) {
                        case AltosDroid.MSG_IGNITER_STATUS:

-                               ia.igniter_status((HashMap <String,Integer>) msg.obj);
+                               @SuppressWarnings("unchecked") HashMap<String,Integer> map = (HashMap <String,Integer>) msg.obj;
+                               ia.igniter_status(map);

                                break;
                        }
                }
                                break;
                        }
                }


@@ -343,7 +344,6 @@ public class IgniterActivity extends Activity {
                super.onCreate(savedInstanceState);
 
                // Setup the window
                super.onCreate(savedInstanceState);
 
                // Setup the window

-               requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

                setContentView(R.layout.igniters);
 
                igniters_view = (ListView) findViewById(R.id.igniters);
                setContentView(R.layout.igniters);
 
                igniters_view = (ListView) findViewById(R.id.igniters);

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java
index dd7dc9670c9f1b43d5875e97643db2dce3ad9a86..cc99c9098133a2b8834671521c547f3d1da2f044 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java
@@ -99,7 +99,7 @@ class FrequencyAdapter extends ArrayAdapter<FrequencyItem> {
                if (position == selected_item)
                        item.frequency_view.setBackgroundColor(Color.RED);
                else
                if (position == selected_item)
                        item.frequency_view.setBackgroundColor(Color.RED);
                else

-                       item.frequency_view.setBackgroundColor(Color.BLACK);
+                       item.frequency_view.setBackgroundColor(0);

                return item.frequency_view;
        }
 }
                return item.frequency_view;
        }
 }


@@ -240,7 +240,6 @@ public class ManageFrequenciesActivity extends Activity {
                super.onCreate(savedInstanceState);
 
                // Setup the window
                super.onCreate(savedInstanceState);
 
                // Setup the window

-               requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

                setContentView(R.layout.manage_frequencies);
 
                frequencies_view = (ListView) findViewById(R.id.frequencies);
                setContentView(R.layout.manage_frequencies);
 
                frequencies_view = (ListView) findViewById(R.id.frequencies);

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java
index f5d8425261e3081bb2623bcb5902e3ee7993cc60..f4a6da1c6958c8c77b6cf02d83e257ebdfa78a16 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java
@@ -62,7 +62,6 @@ public class MapTypeActivity extends Activity {
                super.onCreate(savedInstanceState);
 
                // Setup the window
                super.onCreate(savedInstanceState);
 
                // Setup the window

-               requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

                setContentView(R.layout.map_type);
 
                hybrid = (Button) findViewById(R.id.map_type_hybrid);
                setContentView(R.layout.map_type);
 
                hybrid = (Button) findViewById(R.id.map_type_hybrid);

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index e6fd07fa84a2f1a24db0b511135197e82e51ce62..e6284ef703de2dada625ce0cbf9ea7d5b14c4cfe 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -300,7 +300,6 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
                super.onCreate(savedInstanceState);
 
                // Setup the window
                super.onCreate(savedInstanceState);
 
                // Setup the window

-               requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

                setContentView(R.layout.map_preload);
 
                // Set result CANCELED incase the user backs out
                setContentView(R.layout.map_preload);
 
                // Set result CANCELED incase the user backs out

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java
index ccdfc38ff36fb6e721273d132aed0cb5451f44d9..940525c5b40d648c1dffd1cf19d45e158dfdb9d1 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java
@@ -272,7 +272,6 @@ public class SetupActivity extends Activity {
                AltosDroidPreferences.init(this);
 
                // Setup the window
                AltosDroidPreferences.init(this);
 
                // Setup the window

-               requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

                setContentView(R.layout.setup);
 
                select_rate = (Spinner) findViewById(R.id.select_rate);
                setContentView(R.layout.setup);
 
                select_rate = (Spinner) findViewById(R.id.select_rate);

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabMap.java
index 53bfd2749e918b0c53cef13016be7a3818808c44..43484e29fab64870e063594b6b457f075fed116d 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabMap.java
@@ -42,16 +42,6 @@ public class TabMap extends AltosDroidTab implements AltosDroidMapSourceListener
        private View view;
        private int map_source;
 
        private View view;
        private int map_source;
 

-       @Override
-       public void onAttach(Activity activity) {
-               super.onAttach(activity);
-       }
-
-       @Override
-       public void onCreate(Bundle savedInstanceState) {
-               super.onCreate(savedInstanceState);
-       }
-

        @Override
        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
                view = inflater.inflate(R.layout.tab_map, container, false);
        @Override
        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
                view = inflater.inflate(R.layout.tab_map, container, false);

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java
index 315808017c531fd23ae9c4b329e6caf0e5bd5823..23d365b4492e06c136e3f008eaf6304adde8d759 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java
@@ -83,7 +83,7 @@ public class TabsAdapter extends FragmentPagerAdapter
                mViewPager = pager;
                mTabHost.setOnTabChangedListener(this);
                mViewPager.setAdapter(this);
                mViewPager = pager;
                mTabHost.setOnTabChangedListener(this);
                mViewPager.setAdapter(this);

-               mViewPager.setOnPageChangeListener(this);
+               mViewPager.addOnPageChangeListener(this);

        }
 
        public void addTab(TabHost.TabSpec tabSpec, Class<?> clss, Bundle args) {
        }
 
        public void addTab(TabHost.TabSpec tabSpec, Class<?> clss, Bundle args) {