WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add vercel fallback for module repository for China Mainland users (#2362)

This commit is contained in:
LoveSy 2023-01-31 19:49:53 +08:00 committed by GitHub
parent ebf5bba4d8
commit e5281678a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/org/lsposed/manager/repo/RepoLoader.java
View File

@ -76,7 +76,11 @@ public class RepoLoader {
private final Path repoFile = Paths.get(App.getInstance().getFilesDir().getAbsolutePath(), "repo.json"); private final Path repoFile = Paths.get(App.getInstance().getFilesDir().getAbsolutePath(), "repo.json");
private final Set<RepoListener> listeners = ConcurrentHashMap.newKeySet(); private final Set<RepoListener> listeners = ConcurrentHashMap.newKeySet();
private boolean repoLoaded = false; private boolean repoLoaded = false;
private static final String repoUrl = "https://modules.lsposed.org/"; private static final String originRepoUrl = "https://modules.lsposed.org/";
private static final String backupRepoUrl = "https://modules-vercel.lsposed.org/";
private static final String secondBackupRepoUrl = "https://modules-cloudflare.lsposed.org/";
private static String repoUrl = originRepoUrl;
private final Resources resources = App.getInstance().getResources(); private final Resources resources = App.getInstance().getResources();
private final String[] channels = resources.getStringArray(R.array.update_channel_values); private final String[] channels = resources.getStringArray(R.array.update_channel_values);
@ -94,8 +98,8 @@ public class RepoLoader {
synchronized public void loadRemoteData() { synchronized public void loadRemoteData() {
repoLoaded = false; repoLoaded = false;
var request = new Request.Builder().url(repoUrl + "modules.json").build(); try {
try (var response = App.getOkHttpClient().newCall(request).execute()) { var response = App.getOkHttpClient().newCall(new Request.Builder().url(repoUrl + "modules.json").build()).execute();
if (response.isSuccessful()) { if (response.isSuccessful()) {
ResponseBody body = response.body(); ResponseBody body = response.body();
@ -117,6 +121,13 @@ public class RepoLoader {
for (RepoListener listener : listeners) { for (RepoListener listener : listeners) {
listener.onThrowable(e); listener.onThrowable(e);
} }
if (repoUrl.equals(originRepoUrl)) {
repoUrl = backupRepoUrl;
loadRemoteData();
} else if (repoUrl.equals(backupRepoUrl)) {
repoUrl = secondBackupRepoUrl;
loadRemoteData();
}
} }
} }
@ -240,8 +251,16 @@ public class RepoLoader {
@Override @Override
public void onFailure(@NonNull Call call, @NonNull IOException e) { public void onFailure(@NonNull Call call, @NonNull IOException e) {
Log.e(App.TAG, call.request().url() + e.getMessage()); Log.e(App.TAG, call.request().url() + e.getMessage());
for (RepoListener listener : listeners) { if (repoUrl.equals(originRepoUrl)) {
listener.onThrowable(e); repoUrl = backupRepoUrl;
loadRemoteReleases(packageName);
} else if (repoUrl.equals(backupRepoUrl)) {
repoUrl = secondBackupRepoUrl;
loadRemoteReleases(packageName);
} else {
for (RepoListener listener : listeners) {
listener.onThrowable(e);
}
} }
} }