Merge branch 'Fox2Code:master' into master

Author: mi007d

app/build.gradle

@@ -35,6 +35,7 @@ android {
     lint {
         disable 'MissingTranslation'
     }
+    namespace 'com.fox2code.mmm'
 }
 
 aboutLibraries {
@@ -48,8 +49,8 @@ configurations {
 dependencies {
     // UI
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.emoji2:emoji2:1.0.1'
-    implementation 'androidx.emoji2:emoji2-views-helper:1.0.1'
+    implementation 'androidx.emoji2:emoji2:1.1.0'
+    implementation 'androidx.emoji2:emoji2-views-helper:1.1.0'
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.fox2code.mmm"
     tools:ignore="QueryAllPackagesPermission">
 
     <!-- Wifi is not the only way to get an internet connection -->

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

@@ -3,12 +3,15 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
 import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -47,6 +50,7 @@ public class MainActivity extends CompatActivity implements SwipeRefreshLayout.O
     private int overScrollInsetBottom;
     private TextView actionBarPadding;
     private BlurView actionBarBlur;
+    private ColorDrawable actionBarBackground;
     private RecyclerView moduleList;
     private CardView searchCard;
     private SearchView searchView;
@@ -81,6 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         this.actionBarPadding = findViewById(R.id.action_bar_padding);
         this.actionBarBlur = findViewById(R.id.action_bar_blur);
+        this.actionBarBackground = new ColorDrawable(Color.TRANSPARENT);
         this.progressIndicator = findViewById(R.id.progress_bar);
         this.swipeRefreshLayout = findViewById(R.id.swipe_refresh);
         this.swipeRefreshLayoutOrigStartOffset =
@@ -97,11 +102,13 @@ protected void onCreate(Bundle savedInstanceState) {
         this.moduleList.setItemViewCacheSize(4); // Default is 2
         OverScrollManager.install(this.moduleList, this);
         this.swipeRefreshLayout.setOnRefreshListener(this);
+        this.actionBarBlur.setBackground(this.actionBarBackground);
         this.actionBarBlur.setupWith(this.moduleList).setFrameClearDrawable(
                 this.getWindow().getDecorView().getBackground())
                 .setBlurAlgorithm(new RenderScriptBlur(this))
                 .setBlurRadius(5F).setBlurAutoUpdate(true)
                 .setHasFixedTransformationMatrix(true);
+        this.updateBlurState();
         this.moduleList.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
@@ -223,6 +230,7 @@ private void updateScreenInsets() {
     private void updateScreenInsets(Configuration configuration) {
         boolean landscape = configuration.orientation ==
                 Configuration.ORIENTATION_LANDSCAPE;
+        int bottomInset = (landscape ? 0 : this.getNavigationBarHeight());
         int statusBarHeight = getStatusBarHeight();
         int actionBarHeight = getActionBarHeight();
         int combinedBarsHeight = statusBarHeight + actionBarHeight;
@@ -231,7 +239,6 @@ private void updateScreenInsets(Configuration configuration) {
                 swipeRefreshLayoutOrigStartOffset + combinedBarsHeight,
                 swipeRefreshLayoutOrigEndOffset + combinedBarsHeight);
         this.moduleViewListBuilder.setHeaderPx(actionBarHeight);
-        int bottomInset = (landscape ? 0 : this.getNavigationBarHeight());
         this.moduleViewListBuilder.setFooterPx(
                 bottomInset + this.searchCard.getHeight());
         this.moduleViewListBuilder.updateInsets();
@@ -240,6 +247,26 @@ private void updateScreenInsets(Configuration configuration) {
         this.overScrollInsetBottom = bottomInset;
     }
 
+    private void updateBlurState() {
+        if (MainApplication.isBlurEnabled()) {
+            this.actionBarBlur.setBlurEnabled(true);
+            int transparent = this.getColorCompat(R.color.transparent);
+            this.actionBarBackground.setColor(transparent);
+        } else {
+            this.actionBarBlur.setBlurEnabled(false);
+            boolean isLightMode = this.isLightTheme();
+            int colorOpaque;
+            try {
+                colorOpaque = this.getColorCompat(
+                        android.R.attr.windowBackground);
+            } catch (Resources.NotFoundException e) {
+                colorOpaque = this.getColorCompat(isLightMode ?
+                        R.color.white : R.color.black);
+            }
+            this.actionBarBackground.setColor(colorOpaque);
+        }
+    }
+
     @Override
     public void refreshUI() {
         super.refreshUI();
@@ -251,6 +278,7 @@ public void refreshUI() {
         this.searchView.setIconified(true);
         this.cardIconifyUpdate();
         this.updateScreenInsets();
+        this.updateBlurState();
         this.moduleViewListBuilder.setQuery(null);
         Log.i(TAG, "Item After");
         this.moduleViewListBuilder.refreshNotificationsUI(this.moduleViewAdapter);

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

@@ -7,6 +7,7 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.SystemClock;
 import android.text.SpannableStringBuilder;
 import android.util.Log;
@@ -18,6 +19,7 @@
 import androidx.emoji2.text.FontRequestEmojiCompatConfig;
 
 import com.fox2code.mmm.compat.CompatActivity;
+import com.fox2code.mmm.compat.CompatApplication;
 import com.fox2code.mmm.compat.CompatThemeWrapper;
 import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.utils.GMSProviderInstaller;
@@ -44,7 +46,7 @@
         includeAll = true,
         grammarLocatorClassName = ".Prism4jGrammarLocator"
 )
-public class MainApplication extends Application implements CompatActivity.ApplicationCallbacks {
+public class MainApplication extends CompatApplication {
     private static final String timeFormatString = "dd MMM yyyy"; // Example: 13 july 2001
     private static Locale timeFormatLocale =
             Resources.getSystem().getConfiguration().locale;
@@ -110,6 +112,11 @@ public static boolean isDohEnabled() {
         return getSharedPreferences().getBoolean("pref_dns_over_https", true);
     }
 
+    public static boolean isBlurEnabled() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                getSharedPreferences().getBoolean("pref_enable_blur", false);
+    }
+
     public static boolean isDeveloper() {
         return BuildConfig.DEBUG ||
                 getSharedPreferences().getBoolean("developer", false);
@@ -164,7 +171,6 @@ public static String formatTime(long timeStamp) {
 
     @StyleRes
     private int managerThemeResId = R.style.Theme_MagiskModuleManager;
-    private Boolean nightModeOverride = null;
     private CompatThemeWrapper markwonThemeContext;
     private Markwon markwon;
 
@@ -217,20 +223,7 @@ public void apply(@NonNull String language, @NonNull Prism4j.Syntax syntax,
     @SuppressLint("NonConstantResourceId")
     public void setManagerThemeResId(@StyleRes int resId) {
         this.managerThemeResId = resId;
-        switch (this.managerThemeResId) {
-            case R.style.Theme_MagiskModuleManager:
-                this.nightModeOverride = null;
-                break;
-            case R.style.Theme_MagiskModuleManager_Light:
-                this.nightModeOverride = Boolean.FALSE;
-                break;
-            case R.style.Theme_MagiskModuleManager_Dark:
-                this.nightModeOverride = Boolean.TRUE;
-                break;
-            default:
-        }
         if (this.markwonThemeContext != null) {
-            this.markwonThemeContext.setNightModeOverride(this.nightModeOverride);
             this.markwonThemeContext.setTheme(resId);
         }
         this.markwon = null;
@@ -317,15 +310,15 @@ public void onCreate() {
 
     @Override
     public void onCreateCompatActivity(CompatActivity compatActivity) {
-        compatActivity.setNightModeOverride(this.nightModeOverride);
-        compatActivity.setForceEnglish(isForceEnglish());
+        this.setForceEnglish(isForceEnglish());
+        super.onCreateCompatActivity(compatActivity);
         compatActivity.setTheme(this.managerThemeResId);
     }
 
     @Override
     public void onRefreshUI(CompatActivity compatActivity) {
-        compatActivity.setNightModeOverride(this.nightModeOverride);
-        compatActivity.setForceEnglish(isForceEnglish());
+        this.setForceEnglish(isForceEnglish());
+        super.onRefreshUI(compatActivity);
         compatActivity.setThemeRecreate(this.managerThemeResId);
     }
 

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

@@ -105,6 +105,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         webSettings.setUserAgentString(Http.getAndroidacyUA());
         webSettings.setDomStorageEnabled(true);
         webSettings.setJavaScriptEnabled(true);
+        webSettings.setAllowFileAccess(false);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { // Make website follow app theme
             webSettings.setForceDark(MainApplication.getINSTANCE().isLightTheme() ?
                     WebSettings.FORCE_DARK_OFF : WebSettings.FORCE_DARK_ON);

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

@@ -6,6 +6,8 @@
 import android.webkit.JavascriptInterface;
 import android.widget.Toast;
 
+import androidx.annotation.Keep;
+
 import com.fox2code.mmm.BuildConfig;
 import com.fox2code.mmm.MainApplication;
 import com.fox2code.mmm.installer.InstallerInitializer;
@@ -20,6 +22,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
+@Keep
 public class AndroidacyWebAPI {
     private static final String TAG = "AndroidacyWebAPI";
     private final AndroidacyActivity activity;
@@ -106,7 +109,9 @@ public void install(String moduleUrl, String installTitle,String checksum) {
             return;
         }
         if (checksum != null) checksum = checksum.trim();
-        if (!Hashes.checkSumValid(checksum)) {
+        if (checksum == null || checksum.isEmpty()) {
+            Log.w(TAG, "Androidacy WebView didn't provided a checksum!");
+        } else if (!Hashes.checkSumValid(checksum)) {
             this.forceQuitRaw("Androidacy didn't provided a valid checksum");
             return;
         }

app/src/main/java/com/fox2code/mmm/compat/CompatActivity.java

@@ -11,11 +11,15 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.annotation.AttrRes;
 import androidx.annotation.CallSuper;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.annotation.Dimension;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -24,12 +28,15 @@
 import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 
 import com.fox2code.mmm.Constants;
 import com.fox2code.mmm.R;
 
+import java.lang.ref.WeakReference;
 import java.util.Locale;
 import java.util.Objects;
 
@@ -51,6 +58,7 @@ public boolean onBackPressed(CompatActivity compatActivity) {
         }
     };
 
+    final WeakReference<CompatActivity> selfReference;
     private final CompatConfigHelper compatConfigHelper = new CompatConfigHelper(this);
     private CompatActivity.OnActivityResultCallback onActivityResultCallback;
     private CompatActivity.OnBackPressedCallback onBackPressedCallback;
@@ -65,6 +73,10 @@ public boolean onBackPressed(CompatActivity compatActivity) {
     private boolean forceEnglish;
     private Boolean nightModeOverride;
 
+    public CompatActivity() {
+        this.selfReference = new WeakReference<>(this);
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         if (!this.onCreateCalled) {
@@ -326,7 +338,7 @@ protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean fi
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        this.compatConfigHelper.checkResourcesOverrides(this.getTheme(),
+        this.compatConfigHelper.checkResourcesOverrides(newConfig,
                 this.forceEnglish, this.nightModeOverride);
         super.onConfigurationChanged(newConfig);
     }
@@ -409,11 +421,51 @@ public void setNightModeOverride(Boolean nightModeOverride) {
         this.checkResourcesOverrides(this.forceEnglish, nightModeOverride);
     }
 
+    void propagateResourcesOverride(boolean forceEnglish, Boolean nightModeOverride) {
+        if (this.forceEnglish == forceEnglish &&
+                this.nightModeOverride == nightModeOverride) return;
+        this.forceEnglish = forceEnglish;
+        this.nightModeOverride = nightModeOverride;
+        this.checkResourcesOverrides(forceEnglish, nightModeOverride);
+    }
+
     private void checkResourcesOverrides(boolean forceEnglish,Boolean nightModeOverride) {
         if (this.isRefreshUi || !this.onCreateCalled) return; // Wait before reload
         this.compatConfigHelper.checkResourcesOverrides(forceEnglish, nightModeOverride);
     }
 
+    public boolean isLightTheme() {
+        Resources.Theme theme = this.getTheme();
+        TypedValue typedValue = new TypedValue();
+        theme.resolveAttribute(R.attr.isLightTheme, typedValue, true);
+        if (typedValue.type == TypedValue.TYPE_INT_BOOLEAN) {
+            return typedValue.data != 0;
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            theme.resolveAttribute(android.R.attr.isLightTheme, typedValue, true);
+            if (typedValue.type == TypedValue.TYPE_INT_BOOLEAN) {
+                return typedValue.data != 0;
+            }
+        }
+        theme.resolveAttribute(android.R.attr.background, typedValue, true);
+        if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT &&
+                typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT) {
+            return ColorUtils.calculateLuminance(typedValue.data) > 0.7D;
+        }
+        throw new IllegalStateException("Theme is not a valid theme!");
+    }
+
+    @ColorInt
+    public final int getColorCompat(@ColorRes @AttrRes int color) {
+        TypedValue typedValue = new TypedValue();
+        this.getTheme().resolveAttribute(color, typedValue, true);
+        if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT &&
+                typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT) {
+            return typedValue.data;
+        }
+        return ContextCompat.getColor(this, color);
+    }
+
     public Locale getUserLocale() {
         return this.compatConfigHelper.getUserLocale();
     }
@@ -435,6 +487,10 @@ public static CompatActivity getCompatActivity(Context context) {
         return (CompatActivity) context;
     }
 
+    public WeakReference<CompatActivity> asWeakReference() {
+        return this.selfReference;
+    }
+
     @FunctionalInterface
     public interface OnActivityResultCallback {
         void onActivityResult(int resultCode, @Nullable Intent data);