Release 3.0.0-dev2

Fox2Code · Fox2Code · commit 50c1f9c5b397 · 2022-02-02T15:53:28.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.fox2code.mmm"
         minSdk 21
         targetSdk 32
-        versionCode 22
-        versionName "3.0.0-dev1"
+        versionCode 23
+        versionName "3.0.0-dev2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,9 +37,7 @@ android {
 }
 
 aboutLibraries {
-    additionalLicenses {
-        LGPL_3_0_only
-    }
+    additionalLicenses = ["LGPL_3_0_only"]
 }
 
 configurations {
diff --git a/app/src/main/java/com/fox2code/mmm/AppUpdateManager.java b/app/src/main/java/com/fox2code/mmm/AppUpdateManager.java
@@ -25,6 +25,7 @@ public static AppUpdateManager getAppUpdateManager() {
     private String latestPreRelease;
     private long lastChecked;
     private boolean preReleaseNewer;
+    private boolean lastCheckSuccess;
 
     private AppUpdateManager() {
         this.latestRelease = MainApplication.getBootSharedPreferences()
@@ -85,7 +86,9 @@ public boolean checkUpdate(boolean force) {
                 Log.d(TAG, "Latest pre-release: " + latestPreRelease);
                 Log.d(TAG, "Latest pre-release newer: " + preReleaseNewer);
                 this.lastChecked = System.currentTimeMillis();
+                this.lastCheckSuccess = true;
             } catch (Exception ioe) {
+                this.lastCheckSuccess = false;
                 Log.e("AppUpdateManager", "Failed to check releases", ioe);
             }
         }
@@ -102,4 +105,8 @@ public boolean peekHasUpdate() {
         return !BuildConfig.VERSION_NAME.equals(this.preReleaseNewer ?
                 this.latestPreRelease : this.latestRelease);
     }
+
+    public boolean isLastCheckSuccess() {
+        return lastCheckSuccess;
+    }
 }
diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java
@@ -124,7 +124,7 @@ public void commonNext() {
                                 (int) (value * PRECISION), true) :() ->
                         progressIndicator.setProgressCompat(
                                 (int) (value * PRECISION * 0.75F), true)));
-                if (!RepoManager.getINSTANCE().hasConnectivity()) {
+                if (!NotificationType.NO_INTERNET.shouldRemove()) {
                     moduleViewListBuilder.addNotification(NotificationType.NO_INTERNET);
                 } else {
                     if (AppUpdateManager.getAppUpdateManager().checkUpdate(true))
@@ -210,7 +210,7 @@ public void commonNext() {
                 Log.i(TAG, "Common Before");
                 if (MainApplication.isShowcaseMode())
                     moduleViewListBuilder.addNotification(NotificationType.SHOWCASE_MODE);
-                if (!RepoManager.getINSTANCE().hasConnectivity())
+                if (!NotificationType.NO_INTERNET.shouldRemove())
                     moduleViewListBuilder.addNotification(NotificationType.NO_INTERNET);
                 else if (AppUpdateManager.getAppUpdateManager().checkUpdate(false))
                     moduleViewListBuilder.addNotification(NotificationType.UPDATE_AVAILABLE);
@@ -241,15 +241,15 @@ public void onRefresh() {
             RepoManager.getINSTANCE().update(value -> runOnUiThread(() ->
                     this.progressIndicator.setProgressCompat(
                             (int) (value * PRECISION), true)));
-            if (!RepoManager.getINSTANCE().hasConnectivity())
+            if (!NotificationType.NO_INTERNET.shouldRemove())
                 moduleViewListBuilder.addNotification(NotificationType.NO_INTERNET);
             else if (AppUpdateManager.getAppUpdateManager().checkUpdate(true))
                 moduleViewListBuilder.addNotification(NotificationType.UPDATE_AVAILABLE);
             runOnUiThread(() -> {
                 this.progressIndicator.setVisibility(View.GONE);
                 this.swipeRefreshLayout.setRefreshing(false);
             });
-            if (!RepoManager.getINSTANCE().hasConnectivity()) {
+            if (!NotificationType.NO_INTERNET.shouldRemove()) {
                 this.moduleViewListBuilder.addNotification(NotificationType.NO_INTERNET);
             }
             this.moduleViewListBuilder.appendRemoteModules();
diff --git a/app/src/main/java/com/fox2code/mmm/NotificationType.java b/app/src/main/java/com/fox2code/mmm/NotificationType.java
@@ -48,7 +48,8 @@ public boolean shouldRemove() {
     NO_INTERNET(R.string.fail_internet, R.drawable.ic_baseline_cloud_off_24) {
         @Override
         public boolean shouldRemove() {
-            return RepoManager.getINSTANCE().hasConnectivity();
+            return AppUpdateManager.getAppUpdateManager().isLastCheckSuccess() ||
+                    RepoManager.getINSTANCE().hasConnectivity();
         }
     },
     UPDATE_AVAILABLE(R.string.app_update_available, R.drawable.ic_baseline_system_update_24,
diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java
@@ -43,7 +43,7 @@ protected boolean prepare() {
         if (this.androidacyBlockade > time) return false;
         this.androidacyBlockade = time + 5_000L;
         String cookies = CookieManager.getInstance().getCookie("https://.androidacy.com/");
-        int start = cookies.indexOf("USER=");
+        int start = cookies == null ? -1 : cookies.indexOf("USER=");
         String token = null;
         if (start != -1) {
             int end = cookies.indexOf(";", start);
@@ -73,7 +73,7 @@ protected boolean prepare() {
                 token = new String(Http.doHttpPost(
                         "https://api.androidacy.com/auth/register",
                         "",true), StandardCharsets.UTF_8);
-                CookieManager.getInstance().setCookie(".androidacy.com",
+                CookieManager.getInstance().setCookie("https://.androidacy.com/",
                         "USER="+ token + "; expires=Fri, 31 Dec 9999 23:59:59 GMT;" +
                                 " path=/; secure; domain=.androidacy.com");
             } catch (Exception e) {
diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
@@ -197,9 +197,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
     private void doInstall(File file,boolean noExtensions,boolean rootless) {
-        this.setOnBackPressedCallback(DISABLE_BACK_BUTTON);
-        this.setDisplayHomeAsUpEnabled(false);
         if (this.canceled) return;
+        UiThreadHandler.runAndWait(() -> {
+            this.setOnBackPressedCallback(DISABLE_BACK_BUTTON);
+            this.setDisplayHomeAsUpEnabled(false);
+        });
         Log.i(TAG, "Installing: " + moduleCache.getName());
         InstallerController installerController = new InstallerController(
                 this.progressIndicator, this.installerTerminal,
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
         gradlePluginPortal()
     }
-    project.ext.latestAboutLibsRelease = "10.0.0-b08"
+    project.ext.latestAboutLibsRelease = "10.0.0-b09"
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.0'
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${latestAboutLibsRelease}"

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ android {`
`10`	`10`	`applicationId "com.fox2code.mmm"`
`11`	`11`	`minSdk 21`
`12`	`12`	`targetSdk 32`
`13`		`- versionCode 22`
`14`		`- versionName "3.0.0-dev1"`
	`13`	`+ versionCode 23`
	`14`	`+ versionName "3.0.0-dev2"`
`15`	`15`
`16`	`16`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`17`	`17`	`}`
`@@ -37,9 +37,7 @@ android {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`aboutLibraries {`
`40`		`- additionalLicenses {`
`41`		`- LGPL_3_0_only`
`42`		`- }`
	`40`	`+ additionalLicenses = ["LGPL_3_0_only"]`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`configurations {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public static AppUpdateManager getAppUpdateManager() {`
`25`	`25`	`private String latestPreRelease;`
`26`	`26`	`private long lastChecked;`
`27`	`27`	`private boolean preReleaseNewer;`
	`28`	`+ private boolean lastCheckSuccess;`
`28`	`29`
`29`	`30`	`private AppUpdateManager() {`
`30`	`31`	`this.latestRelease = MainApplication.getBootSharedPreferences()`
`@@ -85,7 +86,9 @@ public boolean checkUpdate(boolean force) {`
`85`	`86`	`Log.d(TAG, "Latest pre-release: " + latestPreRelease);`
`86`	`87`	`Log.d(TAG, "Latest pre-release newer: " + preReleaseNewer);`
`87`	`88`	`this.lastChecked = System.currentTimeMillis();`
	`89`	`+ this.lastCheckSuccess = true;`
`88`	`90`	`} catch (Exception ioe) {`
	`91`	`+ this.lastCheckSuccess = false;`
`89`	`92`	`Log.e("AppUpdateManager", "Failed to check releases", ioe);`
`90`	`93`	`}`
`91`	`94`	`}`
`@@ -102,4 +105,8 @@ public boolean peekHasUpdate() {`
`102`	`105`	`return !BuildConfig.VERSION_NAME.equals(this.preReleaseNewer ?`
`103`	`106`	`this.latestPreRelease : this.latestRelease);`
`104`	`107`	`}`
	`108`	`+`
	`109`	`+ public boolean isLastCheckSuccess() {`
	`110`	`+ return lastCheckSuccess;`
	`111`	`+ }`
`105`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`mavenCentral()`
`6`	`6`	`gradlePluginPortal()`
`7`	`7`	`}`
`8`		`- project.ext.latestAboutLibsRelease = "10.0.0-b08"`
	`8`	`+ project.ext.latestAboutLibsRelease = "10.0.0-b09"`
`9`	`9`	`dependencies {`
`10`	`10`	`classpath 'com.android.tools.build:gradle:7.1.0'`
`11`	`11`	`classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${latestAboutLibsRelease}"`