Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when no internet and local repos, only update local repos

Browse Source 
closes #2146
This commit is contained in:
Hans-Christoph Steiner 2021-04-06 17:49:53 +02:00
parent 5acc87c405
commit 1758c2c9f1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/fdroid/fdroid/UpdateService.java
View File

@ -404,22 +404,23 @@ public class UpdateService extends JobIntentService {
if (isLocalRepoAddress(address)) { if (isLocalRepoAddress(address)) {
Utils.debugLog(TAG, "skipping internet check, this is local: " + address); Utils.debugLog(TAG, "skipping internet check, this is local: " + address);
} else if (netState == ConnectivityMonitorService.FLAG_NET_UNAVAILABLE) { } else if (netState == ConnectivityMonitorService.FLAG_NET_UNAVAILABLE) {
boolean foundLocalRepo = false; // keep track of repos that have a local copy in case internet is not available
ArrayList<Repo> localRepos = new ArrayList<>();
for (Repo repo : repos) { for (Repo repo : repos) {
if (isLocalRepoAddress(repo.address)) { if (isLocalRepoAddress(repo.address)) {
foundLocalRepo = true; localRepos.add(repo);
} else { } else {
for (String mirrorAddress : repo.getMirrorList()) { for (String mirrorAddress : repo.getMirrorList()) {
if (isLocalRepoAddress(mirrorAddress)) { if (isLocalRepoAddress(mirrorAddress)) {
foundLocalRepo = true; localRepos.add(repo);
//localRepos.add(repo);
//FDroidApp.setLastWorkingMirror(repo.getId(), mirrorAddress);
break; break;
} }
} }
} }
} }
if (!foundLocalRepo) { if (localRepos.size() > 0) {
repos = localRepos;
} else {
Utils.debugLog(TAG, "No internet, cannot update"); Utils.debugLog(TAG, "No internet, cannot update");
if (manualUpdate) { if (manualUpdate) {
Utils.showToastFromService(this, getString(R.string.warning_no_internet), Toast.LENGTH_SHORT); Utils.showToastFromService(this, getString(R.string.warning_no_internet), Toast.LENGTH_SHORT);