From 9e6fe0e215e32343b38cdf20080de209a31287dd Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Fri, 9 Feb 2018 12:46:06 +0100
Subject: 8827 - merge request discussions

* add NullPointer checks to EipFragment
* add Provider to DownloadFailedDialog
* remove unused code
* store certificates for pinning in SharedPreferences
---
 .../leap/bitmaskclient/DownloadFailedDialog.java   | 36 +++++++++++++---------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/DownloadFailedDialog.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/DownloadFailedDialog.java b/app/src/main/java/se/leap/bitmaskclient/DownloadFailedDialog.java
index 1a0c85ad..8d56cdf8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/DownloadFailedDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/DownloadFailedDialog.java
@@ -21,6 +21,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 
 import org.json.JSONObject;
@@ -38,8 +39,11 @@ import static se.leap.bitmaskclient.ProviderAPI.ERRORS;
 public class DownloadFailedDialog extends DialogFragment {
 
     public static String TAG = "downloaded_failed_dialog";
-    private String reason_to_fail;
+    private String reasonToFail;
     private DOWNLOAD_ERRORS downloadError = DEFAULT;
+
+    private Provider provider;
+
     public enum DOWNLOAD_ERRORS {
         DEFAULT,
         ERROR_CORRUPTED_PROVIDER_JSON,
@@ -50,39 +54,41 @@ public class DownloadFailedDialog extends DialogFragment {
     /**
      * @return a new instance of this DialogFragment.
      */
-    public static DialogFragment newInstance(String reason_to_fail) {
-        DownloadFailedDialog dialog_fragment = new DownloadFailedDialog();
-        dialog_fragment.reason_to_fail = reason_to_fail;
-        return dialog_fragment;
+    public static DialogFragment newInstance(Provider provider, String reasonToFail) {
+        DownloadFailedDialog dialogFragment = new DownloadFailedDialog();
+        dialogFragment.reasonToFail = reasonToFail;
+        dialogFragment.provider = provider;
+        return dialogFragment;
     }
 
     /**
      * @return a new instance of this DialogFragment.
      */
-    public static DialogFragment newInstance(JSONObject errorJson) {
-        DownloadFailedDialog dialog_fragment = new DownloadFailedDialog();
+    public static DialogFragment newInstance(Provider provider, JSONObject errorJson) {
+        DownloadFailedDialog dialogFragment = new DownloadFailedDialog();
+        dialogFragment.provider = provider;
         try {
             if (errorJson.has(ERRORS)) {
-                dialog_fragment.reason_to_fail = errorJson.getString(ERRORS);
+                dialogFragment.reasonToFail = errorJson.getString(ERRORS);
             } else {
                 //default error msg
-                dialog_fragment.reason_to_fail = dialog_fragment.getString(R.string.error_io_exception_user_message);
+                dialogFragment.reasonToFail = dialogFragment.getString(R.string.error_io_exception_user_message);
             }
 
             if (errorJson.has(ERRORID)) {
-                dialog_fragment.downloadError = valueOf(errorJson.getString(ERRORID));
+                dialogFragment.downloadError = valueOf(errorJson.getString(ERRORID));
             }
         } catch (Exception e) {
             e.printStackTrace();
-            dialog_fragment.reason_to_fail = dialog_fragment.getString(R.string.error_io_exception_user_message);
+            dialogFragment.reasonToFail = dialogFragment.getString(R.string.error_io_exception_user_message);
         }
-        return dialog_fragment;
+        return dialogFragment;
     }
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(reason_to_fail)
+        builder.setMessage(reasonToFail)
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
                 interface_with_ConfigurationWizard.cancelSettingUpProvider();
@@ -113,7 +119,7 @@ switch (downloadError) {
                 builder.setPositiveButton(R.string.retry, new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
                                 dismiss();
-                                interface_with_ConfigurationWizard.retrySetUpProvider(null);
+                                interface_with_ConfigurationWizard.retrySetUpProvider(provider);
                             }
                         });
                 break;
@@ -124,7 +130,7 @@ switch (downloadError) {
     }
 
     public interface DownloadFailedDialogInterface {
-        void retrySetUpProvider(Provider provider);
+        void retrySetUpProvider(@NonNull Provider provider);
 
         void cancelSettingUpProvider();
 
-- 
cgit v1.2.3