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

ignore system partition repos when checking for local repos

Browse Source 
The system partition repos like shipped with CalyxOS are not really visible
to the user, they are built-in.  So they should not prevent the warning
banner showing when the user has switched Over Data and Over WiFi to never.
This commit is contained in:
Hans-Christoph Steiner 2021-04-13 21:58:19 +02:00
parent 908921e978
commit 18a43ac471
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/fdroid/fdroid/views/StatusBanner.java
View File

@ -6,6 +6,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Uri;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
@ -16,6 +17,7 @@ import org.fdroid.fdroid.UpdateService;
import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.net.ConnectivityMonitorService; import org.fdroid.fdroid.net.ConnectivityMonitorService;
import java.util.Arrays;
import java.util.List; import java.util.List;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -99,6 +101,16 @@ public class StatusBanner extends androidx.appcompat.widget.AppCompatTextView {
preferences.unregisterOnSharedPreferenceChangeListener(dataWifiChangeListener); preferences.unregisterOnSharedPreferenceChangeListener(dataWifiChangeListener);
} }
/**
* Display banner with specific text depending on updating status, network
* connectivity, and Data/WiFi Settings. This also takes into account
* whether there are local repos/mirrors available, e.g. if there is a
* mirror on a USB OTG thumb drive. Local repos on system partitions are
* not treated as local mirrors here, they are shipped as part of the
* device, and users are generally not aware of them.
*
* @see org.fdroid.fdroid.data.DBHelper#loadAdditionalRepos(String)
*/
private void setBannerTextAndVisibility() { private void setBannerTextAndVisibility() {
if (updateServiceStatus == UpdateService.STATUS_INFO) { if (updateServiceStatus == UpdateService.STATUS_INFO) {
setText(R.string.banner_updating_repositories); setText(R.string.banner_updating_repositories);
@ -110,7 +122,17 @@ public class StatusBanner extends androidx.appcompat.widget.AppCompatTextView {
} else if (overDataState == Preferences.OVER_NETWORK_NEVER } else if (overDataState == Preferences.OVER_NETWORK_NEVER
&& overWiFiState == Preferences.OVER_NETWORK_NEVER) { && overWiFiState == Preferences.OVER_NETWORK_NEVER) {
localRepos = UpdateService.getLocalRepos(getContext()); localRepos = UpdateService.getLocalRepos(getContext());
if (localRepos.size() == 0) { boolean hasLocalNonSystemRepos = true;
final List<String> systemPartitions = Arrays.asList("odm", "oem", "product", "system", "vendor");
for (Repo repo : localRepos) {
for (String segment : Uri.parse(repo.address).getPathSegments()) {
if (systemPartitions.contains(segment)) {
hasLocalNonSystemRepos = false;
}
break; // only check the first segment NOPMD
}
}
if (localRepos.size() == 0 || !hasLocalNonSystemRepos) {
setText(R.string.banner_no_data_or_wifi); setText(R.string.banner_no_data_or_wifi);
setVisibility(View.VISIBLE); setVisibility(View.VISIBLE);
} else { } else {