Fix WebView uri handling, and fix top inset.

Author: Fox2Code

app/build.gradle

@@ -10,7 +10,7 @@ android {
         applicationId "com.fox2code.mmm"
         minSdk 21
         targetSdk 32
-        versionCode 30
+        versionCode 31
         versionName "0.3.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/fox2code/mmm/MainActivity.java

@@ -244,7 +244,7 @@ private void updateScreenInsets(Configuration configuration) {
                 swipeRefreshLayoutOrigStartOffset + combinedBarsHeight,
                 swipeRefreshLayoutOrigEndOffset + combinedBarsHeight);
         this.moduleViewListBuilder.setHeaderPx(
-                actionBarHeight + CompatDisplay.dpToPixel(4));
+                actionBarHeight + CompatDisplay.dpToPixel(8));
         this.moduleViewListBuilder.setFooterPx(
                 bottomInset + this.searchCard.getHeight());
         this.searchCard.setRadius(this.searchCard.getHeight() / 2F);

app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java

@@ -120,9 +120,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             public boolean shouldOverrideUrlLoading(
                     @NonNull WebView view, @NonNull WebResourceRequest request) {
                 // Don't open non Androidacy urls inside WebView
-                if (request.isForMainFrame() && !(request.getUrl().getScheme().equals("intent") ||
-                        AndroidacyUtil.isAndroidacyLink(request.getUrl()))) {
-                    IntentHelper.openUrl(view.getContext(), request.getUrl().toString());
+                if (request.isForMainFrame() &&
+                        !AndroidacyUtil.isAndroidacyLink(request.getUrl())) {
+                    IntentHelper.openUri(view.getContext(), request.getUrl().toString());
                     return true;
                 }
                 return false;

app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java

@@ -30,8 +30,21 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URISyntaxException;
 
 public class IntentHelper {
+    private static final String TAG = "IntentHelper";
+
+    public static void openUri(Context context, String uri) {
+        if (uri.startsWith("intent://")) {
+            try {
+                startActivity(context, Intent.parseUri(uri, Intent.URI_INTENT_SCHEME), false);
+            } catch (URISyntaxException | ActivityNotFoundException e) {
+                Log.e(TAG, "Failed launch of " + uri, e);
+            }
+        } else openUrl(context, uri);
+    }
+
     public static void openUrl(Context context, String url) {
         openUrl(context, url, false);
     }
@@ -227,7 +240,7 @@ public static void openFileTo(CompatActivity compatActivity, File destination,
                 callback.onReceived(destination, null, RESPONSE_ERROR);
                 return;
             }
-            Log.d("IntentHelper", "FilePicker returned " + uri);
+            Log.d(TAG, "FilePicker returned " + uri);
             if ("http".equals(uri.getScheme()) ||
                     "https".equals(uri.getScheme())) {
                 callback.onReceived(destination, uri, RESPONSE_URL);
@@ -259,15 +272,15 @@ public static void openFileTo(CompatActivity compatActivity, File destination,
                 Files.copy(inputStream, outputStream);
                 success = true;
             } catch (Exception e) {
-                Log.e("IntentHelper", "failed copy of " + uri, e);
+                Log.e(TAG, "failed copy of " + uri, e);
                 Toast.makeText(compatActivity,
                         R.string.file_picker_failure,
                         Toast.LENGTH_SHORT).show();
             } finally {
                 Files.closeSilently(inputStream);
                 Files.closeSilently(outputStream);
                 if (!success && destination.exists() && !destination.delete())
-                    Log.e("IntentHelper", "Failed to delete artefact!");
+                    Log.e(TAG, "Failed to delete artefact!");
             }
             callback.onReceived(destination, uri, success ? RESPONSE_FILE : RESPONSE_ERROR);
         });