summaryrefslogtreecommitdiff
path: root/app/src/main/java/se
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2022-08-09 13:05:42 +0200
committercyBerta <cyberta@riseup.net>2022-08-09 13:05:42 +0200
commit49e755e3f9b2856558e1257887a8d7d0cd95b323 (patch)
treee74670bdc15c55e056c1aa6a2842b1e0e76b8b2e /app/src/main/java/se
parent8e0fa913e098087d73f8ce63888b2213c2c63741 (diff)
fix error dialog buttons after screen rotation
Diffstat (limited to 'app/src/main/java/se')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/MainActivityErrorDialog.java38
1 files changed, 26 insertions, 12 deletions
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 27d61a69..44998868 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
@@ -16,8 +16,22 @@
*/
package se.leap.bitmaskclient.base.fragments;
+import static se.leap.bitmaskclient.R.string.warning_option_try_ovpn;
+import static se.leap.bitmaskclient.R.string.warning_option_try_pt;
+import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_STOP_BLOCKING_VPN;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getPreferredCity;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getUseBridges;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.setPreferredCity;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useBridges;
+import static se.leap.bitmaskclient.eip.EIP.EIPErrors.UNKNOWN;
+import static se.leap.bitmaskclient.eip.EIP.EIPErrors.valueOf;
+import static se.leap.bitmaskclient.eip.EIP.ERRORID;
+import static se.leap.bitmaskclient.eip.EIP.ERRORS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
+
import android.app.Dialog;
import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -33,18 +47,6 @@ import se.leap.bitmaskclient.eip.EIP;
import se.leap.bitmaskclient.eip.EipCommand;
import se.leap.bitmaskclient.providersetup.ProviderAPICommand;
-import static se.leap.bitmaskclient.R.string.warning_option_try_ovpn;
-import static se.leap.bitmaskclient.R.string.warning_option_try_pt;
-import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getPreferredCity;
-import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getUseBridges;
-import static se.leap.bitmaskclient.base.utils.PreferenceHelper.setPreferredCity;
-import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useBridges;
-import static se.leap.bitmaskclient.eip.EIP.EIPErrors.UNKNOWN;
-import static se.leap.bitmaskclient.eip.EIP.EIPErrors.valueOf;
-import static se.leap.bitmaskclient.eip.EIP.ERRORID;
-import static se.leap.bitmaskclient.eip.EIP.ERRORS;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
-
/**
* Implements an error dialog for the main activity.
*
@@ -56,6 +58,8 @@ public class MainActivityErrorDialog extends DialogFragment {
final public static String TAG = "downloaded_failed_dialog";
final private static String KEY_REASON_TO_FAIL = "key reason to fail";
final private static String KEY_PROVIDER = "key provider";
+ final private static String KEY_DOWNLOAD_ERROR = "key_download_error";
+ final private static String KEY_ARGS = "key_args";
private String reasonToFail;
private String[] args;
private EIP.EIPErrors downloadError = UNKNOWN;
@@ -166,6 +170,10 @@ public class MainActivityErrorDialog extends DialogFragment {
super.onSaveInstanceState(outState);
outState.putString(KEY_REASON_TO_FAIL, reasonToFail);
outState.putParcelable(KEY_PROVIDER, provider);
+ outState.putString(KEY_DOWNLOAD_ERROR, downloadError.toString());
+ if (args != null) {
+ outState.putStringArray(KEY_ARGS, args);
+ }
}
private void restoreFromSavedInstance(Bundle savedInstanceState) {
@@ -178,6 +186,12 @@ public class MainActivityErrorDialog extends DialogFragment {
if (savedInstanceState.containsKey(KEY_REASON_TO_FAIL)) {
this.reasonToFail = savedInstanceState.getString(KEY_REASON_TO_FAIL);
}
+ if (savedInstanceState.containsKey(KEY_DOWNLOAD_ERROR)) {
+ this.downloadError = EIP.EIPErrors.valueOf(savedInstanceState.getString(KEY_DOWNLOAD_ERROR));
+ }
+ if (savedInstanceState.containsKey(KEY_ARGS)) {
+ this.args = savedInstanceState.getStringArray(KEY_ARGS);
+ }
}
}