Add settings panels on Android 10

jpelgrom · jpelgrom · commit 477b71090244 · 2020-01-30T15:37:04.000+01:00
- When the user is using Android 10 and some API calls fail, link to the new connctivity settings panel
 - The button to go to the settings when loading a watcher fails will also be visible on older Android versions and link to the regular network/internet settings
diff --git a/README.md b/README.md
@@ -6,6 +6,6 @@ An Android front end application for interacting with a [Movie Notifier](https:/
 
 ## Building
 
- - *Requires* Android Studio 3.6 RC 1 or newer.
+ - *Requires* Android Studio 3.6 RC 2 or newer.
  - Add the `google-services.json` file from your Firebase project to the `app` module.
  - Make sure to add a `gradle.properties` file in the root of the project. An example of the file is [included](https://github.com/jpelgrom/Movie-Notifier-Android/blob/master/gradle.properties.example).
diff --git a/app/src/main/java/nl/jpelgrm/movienotifier/ui/MainActivity.java b/app/src/main/java/nl/jpelgrm/movienotifier/ui/MainActivity.java
@@ -144,15 +144,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        switch(requestCode) {
-            case WatchersFragment.PERMISSION_LOCATION_AUTOMAGIC:
-                if(getSupportFragmentManager().findFragmentByTag("watchersFragment") != null) {
-                    getSupportFragmentManager().findFragmentByTag("watchersFragment").onRequestPermissionsResult(requestCode, permissions, grantResults);
-                }
-                break;
-            default:
-                super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-                break;
+        if (requestCode == WatchersFragment.PERMISSION_LOCATION_AUTOMAGIC) {
+            if (getSupportFragmentManager().findFragmentByTag("watchersFragment") != null) {
+                getSupportFragmentManager().findFragmentByTag("watchersFragment").onRequestPermissionsResult(requestCode, permissions, grantResults);
+            }
+        } else {
+            super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         }
     }
 }
diff --git a/app/src/main/java/nl/jpelgrm/movienotifier/ui/WatcherActivity.java b/app/src/main/java/nl/jpelgrm/movienotifier/ui/WatcherActivity.java
@@ -14,6 +14,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.provider.Settings;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Patterns;
@@ -264,6 +265,13 @@ public void afterTextChanged(Editable editable) {
         });
 
         binding.loaderErrorAccount.setOnClickListener(view -> startActivity(new Intent(WatcherActivity.this, AccountActivity.class)));
+        binding.loaderErrorSettings.setOnClickListener(view -> {
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                startActivity(new Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY));
+            } else {
+                startActivity(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
+            }
+        });
         binding.loaderErrorButton.setOnClickListener(view -> {
             binding.loaderErrorButton.setEnabled(false);
             binding.progress.setVisibility(View.VISIBLE);
@@ -397,8 +405,10 @@ public void onResponse(@NonNull Call<Watcher> call, @NonNull Response<Watcher> r
                     }
                 } else {
                     binding.progress.setVisibility(View.GONE);
+                    binding.loaderErrorSettings.setVisibility(View.GONE);
 
                     if(response.code() == 400) {
+                        binding.loaderErrorAccount.setVisibility(View.GONE);
                         binding.loaderErrorText.setText(R.string.error_watcher_400);
                         binding.loaderErrorButton.setVisibility(View.GONE);
                     } else {
@@ -426,6 +436,7 @@ public void onFailure(@NonNull Call<Watcher> call, @NonNull Throwable t) {
 
                 binding.loaderErrorText.setText(R.string.error_general_exception);
                 binding.loaderErrorAccount.setVisibility(View.GONE);
+                binding.loaderErrorSettings.setVisibility(View.VISIBLE);
                 binding.loaderErrorButton.setEnabled(true);
                 binding.loaderErrorButton.setVisibility(View.VISIBLE);
                 binding.loaderError.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/nl/jpelgrm/movienotifier/ui/WatchersFragment.java b/app/src/main/java/nl/jpelgrm/movienotifier/ui/WatchersFragment.java
@@ -1,13 +1,16 @@
 package nl.jpelgrm.movienotifier.ui;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.location.Location;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,6 +49,7 @@
 
 public class WatchersFragment extends Fragment {
     public static final int PERMISSION_LOCATION_AUTOMAGIC = 153;
+    public static final int INTENT_CONNECTIVITYPANEL_LIST = 170;
 
     private FragmentWatchersBinding binding;
 
@@ -176,6 +180,10 @@ public void onFailure(@NonNull Call<List<Watcher>> call, @NonNull Throwable t) {
                         if(showError) {
                             snackbar = Snackbar.make(binding.coordinator, R.string.error_general_exception_short, Snackbar.LENGTH_INDEFINITE);
                             snackbar.setAnchorView(binding.fab);
+                            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                                snackbar.setAction(R.string.error_general_exception_settings,
+                                        view -> startActivityForResult(new Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY), INTENT_CONNECTIVITYPANEL_LIST));
+                            }
                             snackbar.show();
                         }
                     }
@@ -430,21 +438,30 @@ public Context getContext() {
         }
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        if (requestCode == INTENT_CONNECTIVITYPANEL_LIST) {
+            if (resultCode == Activity.RESULT_OK) {
+                refreshList(false, true);
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        switch(requestCode) {
-            case PERMISSION_LOCATION_AUTOMAGIC:
-                if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    settings.edit().putInt("prefAutomagicLocation", 1).apply();
-                    startLocation();
-                } else {
-                    snackbar = Snackbar.make(binding.coordinator, R.string.settings_general_location_permission_denied, Snackbar.LENGTH_LONG);
-                    snackbar.setAnchorView(binding.fab);
-                    snackbar.show();
-                    settings.edit().putInt("prefAutomagicLocation", 0).apply();
-                }
-                binding.automagicSuggestion.setVisibility(View.GONE);
-                break;
+        if (requestCode == PERMISSION_LOCATION_AUTOMAGIC) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                settings.edit().putInt("prefAutomagicLocation", 1).apply();
+                startLocation();
+            } else {
+                snackbar = Snackbar.make(binding.coordinator, R.string.settings_general_location_permission_denied, Snackbar.LENGTH_LONG);
+                snackbar.setAnchorView(binding.fab);
+                snackbar.show();
+                settings.edit().putInt("prefAutomagicLocation", 0).apply();
+            }
+            binding.automagicSuggestion.setVisibility(View.GONE);
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_watcher.xml b/app/src/main/res/layout/activity_watcher.xml
@@ -438,15 +438,22 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/user_add_title"
-                android:visibility="gone"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
+                android:layout_marginBottom="8dp"
+                android:visibility="gone"/>
+
+            <Button
+                android:id="@+id/loaderErrorSettings"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/error_general_exception_settings"
+                android:layout_marginBottom="8dp"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
 
             <Button
                 android:id="@+id/loaderErrorButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/retry"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
+                android:text="@string/retry"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -179,6 +179,7 @@
     <string name="error_general_401">Please log in to an account or register.</string>
     <string name="error_general_exception">Oops! We encountered an error. Please make sure you have a working network connection and try again.</string>
     <string name="error_general_exception_short">Oops! Check your connection and try again.</string>
+    <string name="error_general_exception_settings">Settings</string>
     <string name="error_general_message">Oops! We encountered an issue. Please try again. You may find this information useful:\n%1$s</string>
     <string name="error_general_server">Oops! The server encountered an error. Please try again. You may find this information useful:\n%1$s</string>
     <string name="error_general_server_short">Oops! Please try again (%1$s).</string>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
+        classpath 'com.android.tools.build:gradle:3.6.0-rc02'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.6.0-rc01'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.6.0-rc02'`
`11`	`11`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`13`	`13`	`// in the individual module build.gradle files`