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

Some users never use WiFi, check for that state on first run

Browse Source 
Lots of people complain that the graphics aren't being downloaded.  That's
because they never use F-Droid while on WiFi and the default prefs do not
allow downloading graphics while on Data.  This sets the preference to
allow downloading graphics while on Data if only Data is enabled, and not
WiFi, when the user first starts F-Droid.

closes #1592
This commit is contained in:
Hans-Christoph Steiner 2019-02-14 15:11:52 +01:00
parent aebf7efc10
commit 57b587dfe3
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/fdroid/fdroid/FDroidApp.java
View File

@ -454,6 +454,7 @@ public class FDroidApp extends Application {
ImageLoader.getInstance().init(config); ImageLoader.getInstance().init(config);
if (preferences.isIndexNeverUpdated()) { if (preferences.isIndexNeverUpdated()) {
preferences.setDefaultForDataOnlyConnection(this);
// force this check to ensure it starts fetching the index on initial runs // force this check to ensure it starts fetching the index on initial runs
networkState = ConnectivityMonitorService.getNetworkState(this); networkState = ConnectivityMonitorService.getNetworkState(this);
} }

22
app/src/main/java/org/fdroid/fdroid/Preferences.java
View File

@ -25,6 +25,8 @@ package org.fdroid.fdroid;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build; import android.os.Build;
import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceManager;
import android.text.format.DateUtils; import android.text.format.DateUtils;
@ -443,6 +445,26 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
return preferences.getInt(PREF_OVER_DATA, IGNORED_I); return preferences.getInt(PREF_OVER_DATA, IGNORED_I);
} }
/**
* Some users never use WiFi, this lets us check for that state on first run.
*/
public void setDefaultForDataOnlyConnection(Context context) {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (cm == null) {
return;
}
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
if (activeNetwork == null || !activeNetwork.isConnectedOrConnecting()) {
return;
}
if (activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE) {
NetworkInfo wifiNetwork = cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
if (!wifiNetwork.isConnectedOrConnecting()) {
preferences.edit().putInt(PREF_OVER_DATA, OVER_NETWORK_ALWAYS).apply();
}
}
}
/** /**
* This preference's default is set dynamically based on whether Orbot is * This preference's default is set dynamically based on whether Orbot is
* installed. If Orbot is installed, default to using Tor, the user can still override * installed. If Orbot is installed, default to using Tor, the user can still override