replace deprecated Bundle.getParcelable(...) call with BundleCompat.getParcelable(...)

4 files changed, 47 insertions, 5 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
index a3e0ae34..76834332 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
@@ -50,6 +50,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.ContextCompat;
+import androidx.core.os.BundleCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
@@ -116,7 +117,7 @@ public class EipFragment extends Fragment implements PropertyChangeListener {
         Activity activity = getActivity();
         if (activity != null) {
             if (arguments != null) {
-                provider = arguments.getParcelable(PROVIDER_KEY);
+                provider = BundleCompat.getParcelable(arguments, PROVIDER_KEY, Provider.class);
                 if (provider == null) {
                     handleNoProvider(activity);
                 } else {
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java
index 56b7259e..c165d19b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java
@@ -43,6 +43,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.os.BundleCompat;
 import androidx.fragment.app.ListFragment;
 
 import java.text.SimpleDateFormat;
@@ -300,7 +301,7 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
             // We have been called
             if (msg.what == MESSAGE_NEWLOG) {
 
-                LogItem logMessage = msg.getData().getParcelable("logmessage");
+                LogItem logMessage = BundleCompat.getParcelable(msg.getData(), "logmessage", LogItem.class);
                 if (addLogMessage(logMessage))
                     for (DataSetObserver observer : observers) {
                         observer.onChanged();
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java
index 3dbdbe64..ca84d330 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java
@@ -37,6 +37,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.os.BundleCompat;
 import androidx.fragment.app.DialogFragment;
 
 import org.json.JSONObject;
@@ -186,7 +187,7 @@ public class MainActivityErrorDialog extends DialogFragment {
             return;
         }
         if (savedInstanceState.containsKey(KEY_PROVIDER)) {
-            this.provider = savedInstanceState.getParcelable(KEY_PROVIDER);
+            this.provider = BundleCompat.getParcelable(savedInstanceState, KEY_PROVIDER, Provider.class);
         }
         if (savedInstanceState.containsKey(KEY_REASON_TO_FAIL)) {
             this.reasonToFail = savedInstanceState.getString(KEY_REASON_TO_FAIL);
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
index a2bf0d8e..51183e5e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
@@ -62,6 +62,7 @@ import io.swagger.client.model.ModelsGateway;
 import io.swagger.client.model.ModelsProvider;
 import motd.IStringCollection;
 import motd.Motd;
+import se.leap.bitmaskclient.BuildConfig;
 
 /**
  * @author Sean Leonard <meanderingcode@aetherislands.net>
@@ -90,7 +91,8 @@ public final class Provider implements Parcelable {
     private String certificatePin = "";
     private String certificatePinEncoding = "";
     private String caCert = "";
-    private int apiVersion = 3;
+    private int apiVersion = 5;
+    private int[] apiVersions = new int[0];
     private String privateKeyString = "";
     private transient PrivateKey privateKey = null;
     private String vpnCertificate = "";
@@ -108,6 +110,7 @@ public final class Provider implements Parcelable {
     final public static String
             API_URL = "api_uri",
             API_VERSION = "api_version",
+            API_VERSIONS = "api_versions",
             ALLOW_REGISTRATION = "allow_registration",
             API_RETURN_SERIAL = "serial",
             SERVICE = "service",
@@ -664,7 +667,8 @@ public final class Provider implements Parcelable {
             this.apiUrl = new URL(definition.getString(API_URL)).toString();
             this.allowAnonymous = definition.getJSONObject(Provider.SERVICE).getBoolean(PROVIDER_ALLOW_ANONYMOUS);
             this.allowRegistered = definition.getJSONObject(Provider.SERVICE).getBoolean(PROVIDER_ALLOWED_REGISTERED);
-            this.apiVersion = Integer.parseInt(getDefinition().getString(Provider.API_VERSION));
+            this.apiVersions = parseApiVersionsArray();
+            this.apiVersion = selectPreferredApiVersion();
             this.domain = getDefinition().getString(Provider.DOMAIN);
             return true;
         } catch (JSONException | ArrayIndexOutOfBoundsException | MalformedURLException | NullPointerException | NumberFormatException e) {
@@ -672,6 +676,41 @@ public final class Provider implements Parcelable {
         }
     }
 
+    /**
+     @returns latest api version supported by client and server or the version set in 'api_version'
+     in case there's not a common supported version
+     */
+    private int selectPreferredApiVersion() throws JSONException {
+        if (apiVersions.length == 0) {
+            return Integer.parseInt(getDefinition().getString(Provider.API_VERSION));
+        }
+
+        // apiVersion is a sorted Array
+        for (int i = apiVersions.length -1; i >= 0; i--) {
+            if (apiVersions[i] == BuildConfig.preferred_client_api_version ||
+                    apiVersions[i] < BuildConfig.preferred_client_api_version) {
+                return apiVersions[i];
+            }
+        }
+
+        return Integer.parseInt(getDefinition().getString(Provider.API_VERSION));
+    }
+
+    private int[] parseApiVersionsArray() {
+        int[] versionArray = new int[0];
+        try {
+            JSONArray versions = getDefinition().getJSONArray(Provider.API_VERSIONS);
+            versionArray = new int[versions.length()];
+            for (int i = 0; i < versions.length(); i++) {
+                versionArray[i] = Integer.parseInt(versions.getString(i));
+            }
+        } catch (JSONException ignore) {
+            // this backend doesn't support api_versions yet
+        }
+        Arrays.sort(versionArray);
+        return versionArray;
+    }
+
     public void setCaCert(String cert) {
         this.caCert = cert;
     }