From a7ea56b5a0e23ac03835f8c2ab3fa21e645c29ef Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 13 Jun 2019 08:09:01 +0200
Subject: [PATCH] Added option to resolve connectivity

---
 .../java/eu/faircode/email/AdapterFolder.java | 15 ++++++++--
 .../email/BoundaryCallbackMessages.java       |  2 +-
 .../eu/faircode/email/ConnectionHelper.java   | 12 ++++++++
 .../eu/faircode/email/FragmentFolders.java    | 15 ++++++++--
 .../eu/faircode/email/FragmentMessages.java   | 29 +++++++++++++++++--
 5 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 76005a2521..740265f7e6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -439,7 +439,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             long fid = args.getLong("folder");
 
                             if (!ConnectionHelper.getNetworkState(context).isSuitable())
-                                throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
+                                throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
                             boolean now = true;
 
@@ -473,7 +473,18 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            if (ex instanceof IllegalArgumentException)
+                            if (ex instanceof IllegalStateException) {
+                                Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG);
+                                final Intent intent = ConnectionHelper.getSettingsIntent(context);
+                                if (intent != null)
+                                    snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View view) {
+                                            context.startActivity(intent);
+                                        }
+                                    });
+                                snackbar.show();
+                            } else if (ex instanceof IllegalArgumentException)
                                 Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                             else
                                 Helper.unexpectedError(context, owner, ex);
diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index de9541f3c1..fe3254bb07 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -245,7 +245,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             try {
                 // Check connectivity
                 if (!ConnectionHelper.getNetworkState(context).isSuitable())
-                    throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
+                    throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                 boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
diff --git a/app/src/main/java/eu/faircode/email/ConnectionHelper.java b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
index 17c4ab86b2..818542262d 100644
--- a/app/src/main/java/eu/faircode/email/ConnectionHelper.java
+++ b/app/src/main/java/eu/faircode/email/ConnectionHelper.java
@@ -5,6 +5,7 @@ import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 import android.net.Network;
@@ -305,4 +306,15 @@ public class ConnectionHelper {
         return Settings.System.getInt(context.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
     }
+
+    static Intent getSettingsIntent(Context context) {
+        Intent intent;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)
+            intent = new Intent(Settings.ACTION_WIRELESS_SETTINGS);
+        else
+            intent = new Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
+        if (intent.resolveActivity(context.getPackageManager()) == null)
+            return null;
+        return intent;
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 6e3644c4c8..44d139a34c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -299,7 +299,7 @@ public class FragmentFolders extends FragmentBase {
                 long aid = args.getLong("account");
 
                 if (!ConnectionHelper.getNetworkState(context).isSuitable())
-                    throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
+                    throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
                 boolean now = true;
 
@@ -342,7 +342,18 @@ public class FragmentFolders extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                if (ex instanceof IllegalArgumentException)
+                if (ex instanceof IllegalStateException) {
+                    Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG);
+                    final Intent intent = ConnectionHelper.getSettingsIntent(getContext());
+                    if (intent != null)
+                        snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                getContext().startActivity(intent);
+                            }
+                        });
+                    snackbar.show();
+                } else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
                     Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index e466c81837..19db0e4001 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -851,7 +851,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 long fid = args.getLong("folder");
 
                 if (!ConnectionHelper.getNetworkState(context).isSuitable())
-                    throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
+                    throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
                 boolean now = true;
 
@@ -893,7 +893,19 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             protected void onException(Bundle args, Throwable ex) {
                 manual = false;
                 swipeRefresh.setRefreshing(false);
-                if (ex instanceof IllegalArgumentException)
+
+                if (ex instanceof IllegalStateException) {
+                    Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG);
+                    final Intent intent = ConnectionHelper.getSettingsIntent(getContext());
+                    if (intent != null)
+                        snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                getContext().startActivity(intent);
+                            }
+                        });
+                    snackbar.show();
+                } else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
                     Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
@@ -2715,7 +2727,18 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         @Override
         public void onError(Throwable ex) {
             if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
-                if (ex instanceof IllegalArgumentException)
+                if (ex instanceof IllegalStateException) {
+                    Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG);
+                    final Intent intent = ConnectionHelper.getSettingsIntent(getContext());
+                    if (intent != null)
+                        snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                getContext().startActivity(intent);
+                            }
+                        });
+                    snackbar.show();
+                } else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
                     new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())