From 3fe42f6f3b01bb241bc68d6bbd1518334c394f8d Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Fri, 9 Jun 2023 21:47:44 -0400 Subject: [PATCH] fix crash Signed-off-by: androidacy-user --- app/src/main/java/com/fox2code/mmm/MainApplication.kt | 3 ++- .../main/java/com/fox2code/mmm/module/ActionButtonType.java | 2 +- app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java | 2 +- app/src/main/java/com/fox2code/mmm/repo/RepoManager.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/fox2code/mmm/MainApplication.kt b/app/src/main/java/com/fox2code/mmm/MainApplication.kt index fd49eca..9a731ae 100644 --- a/app/src/main/java/com/fox2code/mmm/MainApplication.kt +++ b/app/src/main/java/com/fox2code/mmm/MainApplication.kt @@ -704,7 +704,8 @@ class MainApplication : FoxApplication(), Configuration.Provider { private set get() { if (field == null) { - throw IllegalStateException("Application not created yet!") + Timber.w("MainApplication.INSTANCE is null, using fallback!") + return null } return field } diff --git a/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java b/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java index 39beb74..a5cbd07 100644 --- a/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java +++ b/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java @@ -120,7 +120,7 @@ public enum ActionButtonType { IntentHelper.openUrlAndroidacy(button.getContext(), updateZipUrl, true, moduleInfo.name, moduleInfo.config); return; } - boolean hasRoot = InstallerInitializer.peekMagiskPath() != null && !MainApplication.isShowcaseMode(); + boolean hasRoot = InstallerInitializer.peekMagiskPath() != null && !MainApplication.Companion.isShowcaseMode(); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(button.getContext()); builder.setTitle(moduleInfo.name).setCancelable(true).setIcon(R.drawable.ic_baseline_extension_24); CharSequence desc = moduleInfo.description; diff --git a/app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java b/app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java index 6be3d0e..3002260 100644 --- a/app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java +++ b/app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java @@ -225,7 +225,7 @@ public final class ModuleHolder implements Comparable { if (this.repoModule != null && this.moduleInfo != null && !hasUpdate()) { return true; } - return this.notificationType != null ? this.notificationType.shouldRemove() : this.footerPx == -1 && this.moduleInfo == null && (this.repoModule == null || !this.repoModule.repoData.isEnabled() || (PropUtils.isLowQualityModule(this.repoModule.moduleInfo) && !MainApplication.isDisableLowQualityModuleFilter())); + return this.notificationType != null ? this.notificationType.shouldRemove() : this.footerPx == -1 && this.moduleInfo == null && (this.repoModule == null || !this.repoModule.repoData.isEnabled() || (PropUtils.isLowQualityModule(this.repoModule.moduleInfo) && !MainApplication.Companion.isDisableLowQualityModuleFilter())); } public void getButtons(Context context, List buttonTypeList, boolean showcaseMode) { diff --git a/app/src/main/java/com/fox2code/mmm/repo/RepoManager.java b/app/src/main/java/com/fox2code/mmm/repo/RepoManager.java index 956e671..eb24898 100644 --- a/app/src/main/java/com/fox2code/mmm/repo/RepoManager.java +++ b/app/src/main/java/com/fox2code/mmm/repo/RepoManager.java @@ -232,7 +232,7 @@ public final class RepoManager extends SyncManager { } if (BuildConfig.DEBUG) Timber.d("Updating meta-data"); int updatedModules = 0; - boolean allowLowQualityModules = MainApplication.isDisableLowQualityModuleFilter(); + boolean allowLowQualityModules = MainApplication.Companion.isDisableLowQualityModuleFilter(); for (int i = 0; i < repoUpdaters.length; i++) { // Check if the repo is enabled if (!repoUpdaters[i].repoData.isEnabled()) { @@ -373,7 +373,7 @@ public final class RepoManager extends SyncManager { private AndroidacyRepoData addAndroidacyRepoData() { // cache dir is actually under app data File cacheRoot = this.mainApplication.getDataDirWithPath("realms/repos/androidacy_repo"); - AndroidacyRepoData repoData = new AndroidacyRepoData(cacheRoot, MainApplication.isAndroidacyTestMode()); + AndroidacyRepoData repoData = new AndroidacyRepoData(cacheRoot, MainApplication.Companion.isAndroidacyTestMode()); this.repoData.put(ANDROIDACY_MAGISK_REPO_ENDPOINT, repoData); this.repoData.put(ANDROIDACY_TEST_MAGISK_REPO_ENDPOINT, repoData); return repoData;