Merge branch 'fix_new_deprecations'

MarcusWolschon · Aug 14, 2023 · e17c0cd · e17c0cd
2 parents 00a9dc1 + 7761761
commit e17c0cd
Show file tree

Hide file tree

Showing 52 changed files with 249 additions and 135 deletions.
diff --git a/src/main/java/de/blau/android/Feedback.java b/src/main/java/de/blau/android/Feedback.java
@@ -126,11 +126,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-        Serializable s = getIntent().getSerializableExtra(REPO_USER_KEY);
+        Serializable s = Util.getSerializableExtra(getIntent(), REPO_USER_KEY, Serializable.class);
         if (s != null) {
             repoUser = s.toString();
         }
-        s = getIntent().getSerializableExtra(REPO_NAME_KEY);
+        s = Util.getSerializableExtra(getIntent(), REPO_NAME_KEY, Serializable.class);
         if (s != null) {
             repoName = s.toString();
         }

diff --git a/src/main/java/de/blau/android/HelpViewer.java b/src/main/java/de/blau/android/HelpViewer.java
@@ -127,7 +127,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         unselectedItemBackground = ThemeUtils.getStyleAttribColorValue(this, R.attr.unselected_item_background, R.color.light_grey);
         selectedItemBackground = ThemeUtils.getStyleAttribColorValue(this, R.attr.selected_item_background, R.color.dark_grey);
         int topicId = R.string.help_introduction;
-        Serializable s = getIntent().getSerializableExtra(TOPIC);
+        Serializable s = Util.getSerializableExtra(getIntent(), TOPIC, Serializable.class);
         if (s != null) {
             try {
                 topicId = (Integer) s;
@@ -287,7 +287,7 @@ protected void exit() {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        Serializable s = intent.getSerializableExtra(TOPIC);
+        Serializable s = Util.getSerializableExtra(intent, TOPIC, Serializable.class);
         int topicId = R.string.help_introduction;
         if (s != null) {
             try {

diff --git a/src/main/java/de/blau/android/dialogs/ConsoleDialog.java b/src/main/java/de/blau/android/dialogs/ConsoleDialog.java
@@ -124,7 +124,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         Builder builder = new AlertDialog.Builder(getActivity());
         int titleResource = getArguments().getInt(TITLE_KEY);
-        EvalCallback callback = (EvalCallback) getArguments().getSerializable(CALLBACK_KEY);
+        EvalCallback callback = Util.getSerializeable(getArguments(), CALLBACK_KEY, EvalCallback.class);
         int checkbox1Resource = getArguments().getInt(CHECKBOX1_KEY);
         int checkbox2Resource = getArguments().getInt(CHECKBOX2_KEY);
         String initialText = getArguments().getString(INITIAL_TEXT_KEY);

diff --git a/src/main/java/de/blau/android/dialogs/DataLoss.java b/src/main/java/de/blau/android/dialogs/DataLoss.java
@@ -85,10 +85,10 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             Log.d(DEBUG_TAG, "restoring from saved state");
-            intent = savedInstanceState.getParcelable(INTENT_KEY);
+            intent = de.blau.android.util.Util.getParcelable(savedInstanceState, INTENT_KEY, Intent.class);
             requestCode = savedInstanceState.getInt(REQUESTCODE_KEY);
         } else {
-            intent = getArguments().getParcelable(INTENT_KEY);
+            intent = de.blau.android.util.Util.getParcelable(getArguments(), INTENT_KEY, Intent.class);
             requestCode = getArguments().getInt(REQUESTCODE_KEY);
         }
     }

diff --git a/src/main/java/de/blau/android/dialogs/ElementInfo.java b/src/main/java/de/blau/android/dialogs/ElementInfo.java
@@ -207,7 +207,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             parentTag = savedInstanceState.getString(PARENT_TAG_KEY);
         } else {
             // always do this first
-            element = (OsmElement) getArguments().getSerializable(ELEMENT_KEY);
+            element = Util.getSerializeable(getArguments(), ELEMENT_KEY, OsmElement.class);
             ueIndex = getArguments().getInt(UNDOELEMENT_INDEX_KEY, -1);
             parentTag = getArguments().getString(PARENT_TAG_KEY);
             /*

diff --git a/src/main/java/de/blau/android/dialogs/ErrorAlert.java b/src/main/java/de/blau/android/dialogs/ErrorAlert.java
@@ -245,7 +245,7 @@ private static ErrorAlert createNewInstance(final int titleId, final int message
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        titleId = (Integer) getArguments().getSerializable(TITLE);
+        titleId = Util.getSerializeable(getArguments(), TITLE, Integer.class);
         messageId = getArguments().getInt(MESSAGE);
         originalMessage = getArguments().getString(ORIGINAL_MESSAGE);
     }

diff --git a/src/main/java/de/blau/android/dialogs/ForbiddenLogin.java b/src/main/java/de/blau/android/dialogs/ForbiddenLogin.java
@@ -16,6 +16,7 @@
 import de.blau.android.listener.DoNothingListener;
 import de.blau.android.util.ImmersiveDialogFragment;
 import de.blau.android.util.ThemeUtils;
+import de.blau.android.util.Util;
 
 /**
  * Simple alert dialog with an OK button that does nothing
@@ -82,7 +83,7 @@ private static ForbiddenLogin newInstance(@NonNull String message) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        message = (String) getArguments().getSerializable(MESSAGE_KEY);
+        message = Util.getSerializeable(getArguments(), MESSAGE_KEY, String.class);
     }
 
     @NonNull

diff --git a/src/main/java/de/blau/android/dialogs/GetFileName.java b/src/main/java/de/blau/android/dialogs/GetFileName.java
@@ -17,6 +17,7 @@
 import de.blau.android.util.ImmersiveDialogFragment;
 import de.blau.android.util.SaveFile;
 import de.blau.android.util.ThemeUtils;
+import de.blau.android.util.Util;
 
 /**
  * Display a dialog asking for a file name to save to
@@ -26,6 +27,8 @@ public class GetFileName extends ImmersiveDialogFragment {
 
     private static final String DEBUG_TAG = GetFileName.class.getSimpleName();
 
+    private static final String CALLBACK_KEY = "callback";
+
     private static final String TAG = "fragment_save_file";
 
     /**
@@ -64,7 +67,7 @@ private static void dismissDialog(@NonNull FragmentActivity activity) {
     private static GetFileName newInstance(@NonNull de.blau.android.util.SaveFile callback) {
         GetFileName f = new GetFileName();
         Bundle args = new Bundle();
-        args.putSerializable("callback", callback);
+        args.putSerializable(CALLBACK_KEY, callback);
         f.setArguments(args);
         f.setShowsDialog(true);
         return f;
@@ -74,7 +77,7 @@ private static GetFileName newInstance(@NonNull de.blau.android.util.SaveFile ca
     @SuppressLint("InflateParams")
     @Override
     public AppCompatDialog onCreateDialog(Bundle savedInstanceState) {
-        SaveFile callback = (SaveFile) getArguments().getSerializable("callback");
+        SaveFile callback = Util.getSerializeable(getArguments(), CALLBACK_KEY, SaveFile.class);
         final LayoutInflater inflater = ThemeUtils.getLayoutInflater(getActivity());
         Builder builder = new AlertDialog.Builder(getActivity());
         builder.setTitle(R.string.save_file);

diff --git a/src/main/java/de/blau/android/dialogs/GnssPositionInfo.java b/src/main/java/de/blau/android/dialogs/GnssPositionInfo.java
@@ -140,10 +140,10 @@ private static GnssPositionInfo newInstance(@NonNull Location location) {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
-            location = savedInstanceState.getParcelable(LOCATION_KEY);
+            location = Util.getParcelable(savedInstanceState, LOCATION_KEY, Location.class);
             Log.d(DEBUG_TAG, "restoring from saved state");
         } else {
-            location = getArguments().getParcelable(LOCATION_KEY);
+            location = Util.getParcelable(getArguments(), LOCATION_KEY, Location.class);
         }
     }
 

diff --git a/src/main/java/de/blau/android/dialogs/Progress.java b/src/main/java/de/blau/android/dialogs/Progress.java
@@ -187,7 +187,7 @@ private static Progress newInstance(final int dialogType) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        dialogType = (Integer) getArguments().getSerializable(TYPE);
+        dialogType = de.blau.android.util.Util.getSerializeable(getArguments(), TYPE, Integer.class);
     }
 
     @NonNull

diff --git a/src/main/java/de/blau/android/dialogs/ReviewAndUpload.java b/src/main/java/de/blau/android/dialogs/ReviewAndUpload.java
@@ -115,17 +115,16 @@ private static ReviewAndUpload newInstance(@Nullable List<OsmElement> elements)
         return f;
     }
 
-    @SuppressWarnings("unchecked")
     @NonNull
     @SuppressLint("InflateParams")
     @Override
     public AppCompatDialog onCreateDialog(Bundle savedInstanceState) {
         Log.d(DEBUG_TAG, "onCreateDialog");
         if (savedInstanceState != null) {
             Log.d(DEBUG_TAG, "restoring from saved state");
-            elements = (List<OsmElement>) savedInstanceState.getSerializable(ELEMENTS_KEY);
+            elements = Util.getSerializeableArrayList(savedInstanceState, ELEMENTS_KEY, OsmElement.class);
         } else {
-            elements = (List<OsmElement>) getArguments().getSerializable(ELEMENTS_KEY);
+            elements = Util.getSerializeableArrayList(getArguments(), ELEMENTS_KEY, OsmElement.class);
         }
 
         FragmentActivity activity = getActivity();

diff --git a/src/main/java/de/blau/android/dialogs/SearchForm.java b/src/main/java/de/blau/android/dialogs/SearchForm.java
@@ -97,9 +97,9 @@ private static SearchForm newInstance(@Nullable final ViewBox bbox) {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
-            bbox = (ViewBox) savedInstanceState.getSerializable(BBOX_KEY);
+            bbox = de.blau.android.util.Util.getSerializeable(savedInstanceState, BBOX_KEY, ViewBox.class);
         } else {
-            bbox = (ViewBox) getArguments().getSerializable(BBOX_KEY);
+            bbox = de.blau.android.util.Util.getSerializeable(getArguments(), BBOX_KEY, ViewBox.class);
         }
     }
 

diff --git a/src/main/java/de/blau/android/dialogs/TagConflictDialog.java b/src/main/java/de/blau/android/dialogs/TagConflictDialog.java
@@ -91,18 +91,17 @@ private static TagConflictDialog newInstance(@NonNull List<Result> result) {
 
     @NonNull
     @Override
-    @SuppressWarnings("unchecked")
     @SuppressLint("InflateParams")
     public AppCompatDialog onCreateDialog(Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             Log.d(DEBUG_TAG, "Recreating from saved state");
-            result = (List<Result>) savedInstanceState.getSerializable(RESULTS_KEY);
+            result = Util.getSerializeableArrayList(savedInstanceState, RESULTS_KEY, Result.class);
             // restore the elements
             for (Result r : result) {
                 r.restoreElement(App.getDelegator());
             }
         } else {
-            result = (List<Result>) getArguments().getSerializable(RESULTS_KEY);
+            result = Util.getSerializeableArrayList(getArguments(), RESULTS_KEY, Result.class);
         }
         final LayoutInflater inflater = ThemeUtils.getLayoutInflater(getActivity());
         View layout = inflater.inflate(R.layout.tag_conflict, null);

diff --git a/src/main/java/de/blau/android/dialogs/TileSourceDiagnostics.java b/src/main/java/de/blau/android/dialogs/TileSourceDiagnostics.java
@@ -121,9 +121,9 @@ private static TileSourceDiagnostics newInstance(@NonNull MapTile tile) {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
-            tile = (MapTile) savedInstanceState.getSerializable(TILE_KEY);
+            tile = de.blau.android.util.Util.getSerializeable(savedInstanceState, TILE_KEY, MapTile.class);
         } else {
-            tile = (MapTile) getArguments().getSerializable(TILE_KEY);
+            tile = de.blau.android.util.Util.getSerializeable(getArguments(), TILE_KEY, MapTile.class);
         }
     }
 

diff --git a/src/main/java/de/blau/android/dialogs/UploadConflict.java b/src/main/java/de/blau/android/dialogs/UploadConflict.java
@@ -92,9 +92,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             Log.d(DEBUG_TAG, "restoring from saved state");
-            result = (UploadResult) savedInstanceState.getSerializable(UPLOAD_RESULT_KEY);
+            result = de.blau.android.util.Util.getSerializeable(savedInstanceState, UPLOAD_RESULT_KEY, UploadResult.class);
         } else {
-            result = (UploadResult) getArguments().getSerializable(UPLOAD_RESULT_KEY);
+            result = de.blau.android.util.Util.getSerializeable(getArguments(), UPLOAD_RESULT_KEY, UploadResult.class);
         }
     }
 

diff --git a/src/main/java/de/blau/android/dialogs/ViewWayPoint.java b/src/main/java/de/blau/android/dialogs/ViewWayPoint.java
@@ -111,9 +111,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     public AppCompatDialog onCreateDialog(Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             Log.d(DEBUG_TAG, "restoring from saved state");
-            wp = (WayPoint) savedInstanceState.getSerializable(WAYPOINT);
+            wp = de.blau.android.util.Util.getSerializeable(savedInstanceState, WAYPOINT, WayPoint.class);
         } else {
-            wp = (WayPoint) getArguments().getSerializable(WAYPOINT);
+            wp = de.blau.android.util.Util.getSerializeable(getArguments(), WAYPOINT, WayPoint.class);
         }
 
         FragmentActivity activity = getActivity();

diff --git a/src/main/java/de/blau/android/filter/TagFilterActivity.java b/src/main/java/de/blau/android/filter/TagFilterActivity.java
@@ -97,7 +97,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         actionbar.setDisplayHomeAsUpEnabled(true);
         final String filterParam;
         if (savedInstanceState == null) {
-            filterParam = (String) getIntent().getSerializableExtra(FILTER_KEY);
+            filterParam = getIntent().getStringExtra(FILTER_KEY);
         } else {
             filterParam = savedInstanceState.getString(FILTER_KEY);
         }

diff --git a/src/main/java/de/blau/android/layer/geojson/GeoJsonLayerInfo.java b/src/main/java/de/blau/android/layer/geojson/GeoJsonLayerInfo.java
@@ -23,7 +23,7 @@ public class GeoJsonLayerInfo extends LayerInfo {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        layerInfo = (de.blau.android.layer.geojson.MapOverlay.Info) getArguments().getSerializable(LAYER_INFO_KEY);
+        layerInfo = de.blau.android.util.Util.getSerializeable(getArguments(), LAYER_INFO_KEY, de.blau.android.layer.geojson.MapOverlay.Info.class);
     }
 
     @Override

diff --git a/src/main/java/de/blau/android/photos/PhotoViewerActivity.java b/src/main/java/de/blau/android/photos/PhotoViewerActivity.java
@@ -14,6 +14,7 @@
 import de.blau.android.prefs.Preferences;
 import de.blau.android.util.ConfigurationChangeAwareActivity;
 import de.blau.android.util.ImageLoader;
+import de.blau.android.util.Util;
 
 /**
  * 
@@ -76,15 +77,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             // No previous state to restore - get the state from the intent
             Log.d(DEBUG_TAG, "Initializing from intent");
-            photoList = (ArrayList<String>) getIntent().getSerializableExtra(PhotoViewerFragment.PHOTO_LIST_KEY);
+            photoList = getIntent().getStringArrayListExtra(PhotoViewerFragment.PHOTO_LIST_KEY);
             startPos = getIntent().getIntExtra(PhotoViewerFragment.START_POS_KEY, 0);
-            photoLoader = (ImageLoader) getIntent().getSerializableExtra(PhotoViewerFragment.PHOTO_LOADER_KEY);
-            wrap = (boolean) getIntent().getSerializableExtra(PhotoViewerFragment.WRAP_KEY);
+            photoLoader = Util.getSerializableExtra(getIntent(), PhotoViewerFragment.PHOTO_LOADER_KEY, ImageLoader.class);
+            wrap = Util.getSerializableExtra(getIntent(), PhotoViewerFragment.WRAP_KEY, Boolean.class);
         } else {
             Log.d(DEBUG_TAG, "Initializing from saved state");
             photoList = savedInstanceState.getStringArrayList(PhotoViewerFragment.PHOTO_LIST_KEY);
             startPos = savedInstanceState.getInt(PhotoViewerFragment.START_POS_KEY);
-            photoLoader = (ImageLoader) savedInstanceState.getSerializable(PhotoViewerFragment.PHOTO_LOADER_KEY);
+            photoLoader = Util.getSerializeable(savedInstanceState, PhotoViewerFragment.PHOTO_LOADER_KEY, ImageLoader.class);
             wrap = savedInstanceState.getBoolean(PhotoViewerFragment.WRAP_KEY);
         }
         String tag = PhotoViewerFragment.class.getName() + this.getClass().getName();
@@ -98,8 +99,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        ArrayList<String> tempList = (ArrayList<String>) intent.getSerializableExtra(PhotoViewerFragment.PHOTO_LIST_KEY);
-        int tempPos = (int) intent.getSerializableExtra(PhotoViewerFragment.START_POS_KEY);
+        ArrayList<String> tempList = getIntent().getStringArrayListExtra(PhotoViewerFragment.PHOTO_LIST_KEY);
+        int tempPos = intent.getIntExtra(PhotoViewerFragment.START_POS_KEY, 0);
         String tempPhoto = tempList.get(tempPos);
         int index = photoList.indexOf(tempPhoto);
         Fragment f = getSupportFragmentManager().findFragmentById(android.R.id.content);

diff --git a/src/main/java/de/blau/android/photos/PhotoViewerFragment.java b/src/main/java/de/blau/android/photos/PhotoViewerFragment.java
@@ -40,6 +40,7 @@
 import de.blau.android.util.SizedDynamicImmersiveDialogFragment;
 import de.blau.android.util.Snack;
 import de.blau.android.util.ThemeUtils;
+import de.blau.android.util.Util;
 
 /**
  * Very simple photo viewer
@@ -201,14 +202,14 @@ private View createView(@Nullable Bundle savedInstanceState) {
             Log.d(DEBUG_TAG, "Initializing from intent");
             photoList = getArguments().getStringArrayList(PHOTO_LIST_KEY);
             startPos = getArguments().getInt(START_POS_KEY);
-            photoLoader = (ImageLoader) getArguments().getSerializable(PHOTO_LOADER_KEY);
+            photoLoader = Util.getSerializeable(getArguments(), PHOTO_LOADER_KEY, ImageLoader.class);
             getArguments().remove(PHOTO_LOADER_KEY);
             wrap = getArguments().getBoolean(WRAP_KEY, true);
         } else {
             Log.d(DEBUG_TAG, "Initializing from saved state");
             photoList = savedInstanceState.getStringArrayList(PHOTO_LIST_KEY);
             startPos = savedInstanceState.getInt(START_POS_KEY);
-            photoLoader = (ImageLoader) savedInstanceState.getSerializable(PHOTO_LOADER_KEY);
+            photoLoader = Util.getSerializeable(savedInstanceState, PHOTO_LOADER_KEY, ImageLoader.class);
             wrap = savedInstanceState.getBoolean(WRAP_KEY);
         }
         if (photoLoader == null) {

diff --git a/src/main/java/de/blau/android/presets/Preset.java b/src/main/java/de/blau/android/presets/Preset.java
@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.io.Serializable;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -83,7 +84,9 @@
  * 
  * @author Jan Schejbal
  */
-public class Preset {
+public class Preset implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     static final String COMBO_DELIMITER       = ",";
     static final String MULTISELECT_DELIMITER = ";";

diff --git a/src/main/java/de/blau/android/presets/PresetCheckField.java b/src/main/java/de/blau/android/presets/PresetCheckField.java
@@ -10,6 +10,8 @@
 import de.blau.android.util.StringWithDescription;
 
 public class PresetCheckField extends PresetTagField {
+    private static final long serialVersionUID = 1L;
+
     /**
      * on value
      */

diff --git a/src/main/java/de/blau/android/presets/PresetCheckGroupField.java b/src/main/java/de/blau/android/presets/PresetCheckGroupField.java
@@ -14,7 +14,8 @@
 import ch.poole.poparser.Po;
 
 public class PresetCheckGroupField extends PresetTagField {
-
+    private static final long serialVersionUID = 1L;
+
     private Map<String, PresetCheckField> checks = new LinkedHashMap<>();
 
     /**