Move scheme constants to own class

Author: simonpoole

src/main/java/de/blau/android/contract/Schemes.java

@@ -0,0 +1,13 @@
+package de.blau.android.contract;
+
+public final class Schemes {
+    public static final String FILE    = "file";
+    public static final String CONTENT = "content";
+
+    /**
+     * Private default constructor
+     */
+    private Schemes() {
+        // empty
+    }
+}

src/main/java/de/blau/android/osm/Server.java

@@ -41,6 +41,7 @@
 import de.blau.android.PostAsyncActionHandler;
 import de.blau.android.R;
 import de.blau.android.contract.MimeTypes;
+import de.blau.android.contract.Schemes;
 import de.blau.android.contract.Urls;
 import de.blau.android.dialogs.ErrorAlert;
 import de.blau.android.exception.OsmException;
@@ -225,7 +226,7 @@ public Server(@NonNull Context context, @NonNull final API api, @NonNull final S
 
         // if we have a tiled OSM data source, open
         Uri readOnlyUri = Uri.parse(getReadOnlyUrl());
-        if (FileUtil.FILE_SCHEME.equals(readOnlyUri.getScheme())) {
+        if (Schemes.FILE.equals(readOnlyUri.getScheme())) {
             MBTileProviderDataBase tempDB = null;
             try {
                 tempDB = new MBTileProviderDataBase(context, readOnlyUri, 1);

src/main/java/de/blau/android/prefs/PresetEditorActivity.java

@@ -44,6 +44,7 @@
 import de.blau.android.App;
 import de.blau.android.HelpViewer;
 import de.blau.android.R;
+import de.blau.android.contract.Schemes;
 import de.blau.android.dialogs.Progress;
 import de.blau.android.exception.OperationFailedException;
 import de.blau.android.osm.Server;
@@ -292,7 +293,7 @@ protected void onPreExecute() {
             protected Integer doInBackground(Void... args) {
                 int loadResult = RESULT_TOTAL_SUCCESS;
                 Uri uri = Uri.parse(item.value);
-                if (FileUtil.FILE_SCHEME.equals(uri.getScheme())) {
+                if (Schemes.FILE.equals(uri.getScheme())) {
                     loadResult = load(uri, Preset.PRESETXML);
                 } else {
                     loadResult = download(item.value, Preset.PRESETXML);

src/main/java/de/blau/android/util/FileUtil.java

@@ -15,11 +15,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import de.blau.android.contract.Paths;
+import de.blau.android.contract.Schemes;
 
 public abstract class FileUtil {
     private static final String DEBUG_TAG          = FileUtil.class.getSimpleName();
-    public static final String  FILE_SCHEME        = "file";
-    public static final String  FILE_SCHEME_PREFIX = "file:";
+    public static final String  FILE_SCHEME_PREFIX = Schemes.FILE + ":";
 
     /**
      * Private constructor to stop instantiation

src/main/java/de/blau/android/util/SelectFile.java

@@ -20,6 +20,7 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 import de.blau.android.R;
+import de.blau.android.contract.Schemes;
 import de.blau.android.prefs.Preferences;
 
 /**
@@ -201,7 +202,7 @@ public static void handleResult(int code, @NonNull Intent data) {
      * @param fileUri the file uri
      */
     public static void savePref(Preferences prefs, int directoryPrefKey, Uri fileUri) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT && FileUtil.FILE_SCHEME.equals(fileUri.getScheme())) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT && Schemes.FILE.equals(fileUri.getScheme())) {
             int slash = fileUri.getPath().lastIndexOf('/');
             if (slash >= 0) {
                 String path = fileUri.getPath().substring(0, slash + 1);
@@ -261,7 +262,7 @@ public static String getPath(@NonNull Context context, @NonNull Uri uri) {
                 Log.i(DEBUG_TAG, "content scheme");
                 return getDataColumn(context, uri, null, null);
             }
-        } else if (FileUtil.FILE_SCHEME.equalsIgnoreCase(uri.getScheme())) {
+        } else if (Schemes.FILE.equalsIgnoreCase(uri.getScheme())) {
             return uri.getPath();
         }
         Log.e(DEBUG_TAG, "Unable to determine how to handle Uri " + uri);