From 26f6d4e65720eafd9a7361f3fb8721650a3e48ba Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Fri, 9 Dec 2022 21:07:16 -0500 Subject: [PATCH] Remove DG repo Users are free to add it back manually but it's been disabled for awhile now, and when users tried to add it, it would not stay enabled because the manager determined it was a built-in repo Signed-off-by: androidacy-user --- .../com/fox2code/mmm/repo/RepoManager.java | 21 ------------- .../mmm/settings/SettingsActivity.java | 1 - app/src/main/res/xml/repo_preferences.xml | 30 ------------------- 3 files changed, 52 deletions(-) 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 ab4b39f..586fc38 100644 --- a/app/src/main/java/com/fox2code/mmm/repo/RepoManager.java +++ b/app/src/main/java/com/fox2code/mmm/repo/RepoManager.java @@ -34,8 +34,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Objects; - public final class RepoManager extends SyncManager { public static final String MAGISK_REPO = "https://raw.githubusercontent.com/Magisk-Modules-Repo/submission/modules/modules.json"; @@ -52,12 +50,6 @@ public final class RepoManager extends SyncManager { "https://staging-api.androidacy.com/magisk/repo"; public static final String ANDROIDACY_MAGISK_REPO_HOMEPAGE = "https://www.androidacy.com/modules-repo"; - public static final String DG_MAGISK_REPO = - "https://repo.dergoogler.com/modules.json"; - public static final String DG_MAGISK_REPO_GITHUB = - "https://googlers-magisk-repo.github.io/modules.json"; - public static final String DG_MAGISK_REPO_GITHUB_RAW = - "https://raw.githubusercontent.com/Googlers-Repo/googlers-repo.github.io/master/modules.json"; private static final String TAG = "RepoManager"; private static final String MAGISK_REPO_MANAGER = "https://magisk-modules-repo.github.io/submission/modules.json"; @@ -88,9 +80,6 @@ public final class RepoManager extends SyncManager { altRepo.defaultWebsite = RepoManager.MAGISK_ALT_REPO_HOMEPAGE; altRepo.defaultSubmitModule = "https://github.com/Magisk-Modules-Alt-Repo/submission/issues"; - RepoData dgRepo = this.addRepoData( - DG_MAGISK_REPO_GITHUB_RAW, "Googlers Magisk Repo"); - dgRepo.defaultWebsite = "https://dergoogler.com/repo"; this.androidacyRepoData = this.addAndroidacyRepoData(); this.customRepoManager = new CustomRepoManager(mainApplication, this); XHooks.onRepoManagerInitialize(); @@ -148,10 +137,6 @@ public final class RepoManager extends SyncManager { case ANDROIDACY_MAGISK_REPO_ENDPOINT: case ANDROIDACY_TEST_MAGISK_REPO_ENDPOINT: return "androidacy_repo"; - case DG_MAGISK_REPO: - case DG_MAGISK_REPO_GITHUB: - case DG_MAGISK_REPO_GITHUB_RAW: - return "dg_magisk_repo"; default: return "repo_" + Hashes.hashSha1( url.getBytes(StandardCharsets.UTF_8)); @@ -164,9 +149,6 @@ public final class RepoManager extends SyncManager { case RepoManager.MAGISK_ALT_REPO_JSDELIVR: case RepoManager.ANDROIDACY_MAGISK_REPO_ENDPOINT: case RepoManager.ANDROIDACY_TEST_MAGISK_REPO_ENDPOINT: - case RepoManager.DG_MAGISK_REPO: - case RepoManager.DG_MAGISK_REPO_GITHUB: - case RepoManager.DG_MAGISK_REPO_GITHUB_RAW: return true; } return false; @@ -214,9 +196,6 @@ public final class RepoManager extends SyncManager { public RepoData addOrGet(String url, String fallBackName) { if (MAGISK_ALT_REPO_JSDELIVR.equals(url)) url = MAGISK_ALT_REPO; - if (DG_MAGISK_REPO.equals(url) || - DG_MAGISK_REPO_GITHUB.equals(url)) - url = DG_MAGISK_REPO_GITHUB_RAW; RepoData repoData; synchronized (this.syncLock) { repoData = this.repoData.get(url); diff --git a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java index f268c87..44355e7 100644 --- a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java +++ b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java @@ -517,7 +517,6 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity { setPreferencesFromResource(R.xml.repo_preferences, rootKey); setRepoData(RepoManager.MAGISK_ALT_REPO); setRepoData(RepoManager.ANDROIDACY_MAGISK_REPO_ENDPOINT); - setRepoData(RepoManager.DG_MAGISK_REPO_GITHUB); updateCustomRepoList(true); onCreatePreferencesAndroidacy(); } diff --git a/app/src/main/res/xml/repo_preferences.xml b/app/src/main/res/xml/repo_preferences.xml index 9c479e0..3e13f30 100644 --- a/app/src/main/res/xml/repo_preferences.xml +++ b/app/src/main/res/xml/repo_preferences.xml @@ -87,36 +87,6 @@ app:singleLineTitle="false" app:summary="@string/androidacy_repo_info" /> - - - - - - -