Skip to content

Commit 3fe42f6

Browse files
fix crash
Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent cf095f3 commit 3fe42f6

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,8 @@ class MainApplication : FoxApplication(), Configuration.Provider {
704704
private set
705705
get() {
706706
if (field == null) {
707-
throw IllegalStateException("Application not created yet!")
707+
Timber.w("MainApplication.INSTANCE is null, using fallback!")
708+
return null
708709
}
709710
return field
710711
}

app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void doAction(Chip button, ModuleHolder moduleHolder) {
120120
IntentHelper.openUrlAndroidacy(button.getContext(), updateZipUrl, true, moduleInfo.name, moduleInfo.config);
121121
return;
122122
}
123-
boolean hasRoot = InstallerInitializer.peekMagiskPath() != null && !MainApplication.isShowcaseMode();
123+
boolean hasRoot = InstallerInitializer.peekMagiskPath() != null && !MainApplication.Companion.isShowcaseMode();
124124
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(button.getContext());
125125
builder.setTitle(moduleInfo.name).setCancelable(true).setIcon(R.drawable.ic_baseline_extension_24);
126126
CharSequence desc = moduleInfo.description;

app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public boolean shouldRemove() {
225225
if (this.repoModule != null && this.moduleInfo != null && !hasUpdate()) {
226226
return true;
227227
}
228-
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()));
228+
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()));
229229
}
230230

231231
public void getButtons(Context context, List<ActionButtonType> buttonTypeList, boolean showcaseMode) {

app/src/main/java/com/fox2code/mmm/repo/RepoManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ protected void scanInternal(@NonNull UpdateListener updateListener) {
232232
}
233233
if (BuildConfig.DEBUG) Timber.d("Updating meta-data");
234234
int updatedModules = 0;
235-
boolean allowLowQualityModules = MainApplication.isDisableLowQualityModuleFilter();
235+
boolean allowLowQualityModules = MainApplication.Companion.isDisableLowQualityModuleFilter();
236236
for (int i = 0; i < repoUpdaters.length; i++) {
237237
// Check if the repo is enabled
238238
if (!repoUpdaters[i].repoData.isEnabled()) {
@@ -373,7 +373,7 @@ private RepoData addRepoData(String url, String fallBackName) {
373373
private AndroidacyRepoData addAndroidacyRepoData() {
374374
// cache dir is actually under app data
375375
File cacheRoot = this.mainApplication.getDataDirWithPath("realms/repos/androidacy_repo");
376-
AndroidacyRepoData repoData = new AndroidacyRepoData(cacheRoot, MainApplication.isAndroidacyTestMode());
376+
AndroidacyRepoData repoData = new AndroidacyRepoData(cacheRoot, MainApplication.Companion.isAndroidacyTestMode());
377377
this.repoData.put(ANDROIDACY_MAGISK_REPO_ENDPOINT, repoData);
378378
this.repoData.put(ANDROIDACY_TEST_MAGISK_REPO_ENDPOINT, repoData);
379379
return repoData;

0 commit comments

Comments
 (0)