diff --git a/app/build.gradle b/app/build.gradle index c8f51844c..1f8322f42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation 'com.android.support:support-vector-drawable:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.0' implementation 'com.android.support:palette-v7:27.1.1' - implementation 'com.android.support:preference-v7:27.1.1' + implementation 'com.android.support:preference-v14:27.1.1' implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'com.google.zxing:core:3.3.2' diff --git a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java index 1cd3db664..576431f6e 100644 --- a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java +++ b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java @@ -5,8 +5,8 @@ import android.content.SharedPreferences; import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Build; -import android.preference.PreferenceManager; import android.support.annotation.Nullable; +import android.support.v7.preference.PreferenceManager; import org.fdroid.fdroid.compat.SupportedArchitectures; import org.fdroid.fdroid.data.Apk; diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index 4dc49628e..65bc50821 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -1,9 +1,11 @@ package org.fdroid.fdroid; +import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; import android.os.Build; -import android.preference.PreferenceManager; +import android.support.v7.preference.PreferenceManager; +import android.text.format.DateUtils; import android.util.Log; import info.guardianproject.netcipher.NetCipher; import org.fdroid.fdroid.net.ConnectivityMonitorService; @@ -41,10 +43,11 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } } - public static final String PREF_UPD_INTERVAL = "updateInterval"; - public static final String PREF_UPD_WIFI_ONLY = "updateOnWifiOnly"; + public static final String PREF_OVER_WIFI = "overWifi"; + public static final String PREF_OVER_DATA = "overData"; + public static final String PREF_UPDATE_INTERVAL = "updateIntervalSeekBarPosition"; public static final String PREF_AUTO_DOWNLOAD_INSTALL_UPDATES = "updateAutoDownload"; - public static final String PREF_UPD_NOTIFY = "updateNotify"; + public static final String PREF_UPDATE_NOTIFICATION_ENABLED = "updateNotify"; public static final String PREF_THEME = "theme"; public static final String PREF_SHOW_INCOMPAT_VERSIONS = "incompatibleVersions"; public static final String PREF_SHOW_ROOT_APPS = "rooted"; @@ -72,10 +75,16 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh public static final String PREF_PANIC_HIDE = "pref_panic_hide"; public static final String PREF_HIDE_ON_LONG_PRESS_SEARCH = "hideOnLongPressSearch"; + public static final int OVER_NETWORK_NEVER = 0; + public static final int OVER_NETWORK_ON_DEMAND = 1; + public static final int OVER_NETWORK_ALWAYS = 2; + private static final boolean DEFAULT_SHOW_INCOMPAT_VERSIONS = false; private static final boolean DEFAULT_SHOW_ROOT_APPS = true; private static final boolean DEFAULT_SHOW_ANTI_FEATURE_APPS = true; - private static final int DEFAULT_UPD_INTERVAL = 24; + public static final int DEFAULT_OVER_WIFI = OVER_NETWORK_ALWAYS; + public static final int DEFAULT_OVER_DATA = OVER_NETWORK_ON_DEMAND; + public static final int DEFAULT_UPDATE_INTERVAL = 3; private static final boolean DEFAULT_PRIVILEGED_INSTALLER = true; //private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true; private static final long DEFAULT_KEEP_CACHE_TIME = TimeUnit.DAYS.toMillis(1); @@ -95,6 +104,11 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh private static final boolean DEFAULT_PANIC_EXIT = true; private static final boolean DEFAULT_HIDE_ON_LONG_PRESS_SEARCH = false; + @Deprecated + private static final String OLD_PREF_UPDATE_INTERVAL = "updateInterval"; + @Deprecated + private static final String OLD_PREF_UPDATE_ON_WIFI_ONLY = "updateOnWifiOnly"; + public enum Theme { light, dark, @@ -102,6 +116,16 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh lightWithDarkActionBar, // Obsolete } + public static final long[] UPDATE_INTERVAL_VALUES = { + Long.MAX_VALUE, // never + DateUtils.WEEK_IN_MILLIS * 2, + DateUtils.WEEK_IN_MILLIS, + DateUtils.DAY_IN_MILLIS, + DateUtils.HOUR_IN_MILLIS * 12, + DateUtils.HOUR_IN_MILLIS * 4, + DateUtils.HOUR_IN_MILLIS, + }; + private boolean showAppsRequiringRoot = DEFAULT_SHOW_ROOT_APPS; private boolean showAppsWithAntiFeatures = DEFAULT_SHOW_ANTI_FEATURE_APPS; @@ -161,16 +185,80 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh /** * Get the update interval in milliseconds. */ - public int getUpdateInterval() { - int hours; - try { - String value = preferences.getString(PREF_UPD_INTERVAL, - String.valueOf(DEFAULT_UPD_INTERVAL)); - hours = Integer.parseInt(value); - } catch (NumberFormatException e) { - hours = DEFAULT_UPD_INTERVAL; + public long getUpdateInterval() { + if (getOverData() == OVER_NETWORK_NEVER && getOverWifi() == OVER_NETWORK_NEVER) { + return UPDATE_INTERVAL_VALUES[0]; + } else { + int position = preferences.getInt(PREF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL); + return UPDATE_INTERVAL_VALUES[position]; } - return hours * 60 * 60 * 1000; + } + + /** + * Migrate old preferences to new preferences. These need to be processed + * and committed before {@code preferences.xml} is loaded. + */ + @SuppressLint("ApplySharedPref") + public void migrateOldPreferences() { + SharedPreferences.Editor editor = preferences.edit(); + if (migrateUpdateIntervalStringToInt(editor) || migrateOnlyOnWifi(editor)) { + editor.commit(); + } + } + + /** + * The original preference was a {@link String}, now it must be a {@link Integer} + * since {@link android.support.v7.preference.SeekBarPreference} uses it + * directly. + */ + private boolean migrateUpdateIntervalStringToInt(SharedPreferences.Editor editor) { + if (!preferences.contains(OLD_PREF_UPDATE_INTERVAL)) { + return false; // already completed + } + int updateInterval = DEFAULT_UPDATE_INTERVAL; + String value = preferences.getString(OLD_PREF_UPDATE_INTERVAL, String.valueOf(24)); + if ("1".equals(value)) { // 1 hour + updateInterval = 6; + } else if ("4".equals(value)) { // 4 hours + updateInterval = 5; + } else if ("12".equals(value)) { // 12 hours + updateInterval = 4; + } else if ("24".equals(value)) { // 1 day + updateInterval = 3; + } else if ("168".equals(value)) { // 2 weeks + updateInterval = 2; + } else if ("336".equals(value)) { // 1 week + updateInterval = 1; + } else if ("0".equals(value)) { // never + updateInterval = 0; + } + editor + .putInt(PREF_UPDATE_INTERVAL, updateInterval) + .remove(OLD_PREF_UPDATE_INTERVAL); + return true; + } + + /** + * The original preference was just a "Only on Wifi" checkbox. + */ + private boolean migrateOnlyOnWifi(SharedPreferences.Editor editor) { + if (!preferences.contains(OLD_PREF_UPDATE_ON_WIFI_ONLY)) { + return false; // already completed + } + int wifi; + int data; + if (preferences.getBoolean(OLD_PREF_UPDATE_ON_WIFI_ONLY, true)) { + wifi = OVER_NETWORK_ALWAYS; + data = OVER_NETWORK_NEVER; + } else { + wifi = OVER_NETWORK_ALWAYS; + data = OVER_NETWORK_ON_DEMAND; + } + editor + .putInt(PREF_OVER_WIFI, wifi) + .putInt(PREF_OVER_DATA, data) + .remove(OLD_PREF_UPDATE_ON_WIFI_ONLY); + return true; } /** @@ -283,7 +371,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } public boolean isUpdateNotificationEnabled() { - return preferences.getBoolean(PREF_UPD_NOTIFY, true); + return preferences.getBoolean(PREF_UPDATE_NOTIFICATION_ENABLED, true); } public boolean isAutoDownloadEnabled() { @@ -295,9 +383,29 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh * downloaded in the background. */ public boolean isBackgroundDownloadAllowed() { - return FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT || - (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED - && !preferences.getBoolean(PREF_UPD_WIFI_ONLY, false)); + if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT) { + return getOverWifi() == OVER_NETWORK_ALWAYS; + } else if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED) { + return getOverData() == OVER_NETWORK_ALWAYS; + } + return false; + } + + public boolean isOnDemandDownloadAllowed() { + if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT) { + return getOverWifi() != OVER_NETWORK_NEVER; + } else if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED) { + return getOverData() != OVER_NETWORK_NEVER; + } + return false; + } + + public int getOverWifi() { + return preferences.getInt(PREF_OVER_WIFI, DEFAULT_OVER_WIFI); + } + + public int getOverData() { + return preferences.getInt(PREF_OVER_DATA, DEFAULT_OVER_DATA); } /** diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index 73f7591cd..563bfd405 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -36,9 +36,9 @@ import android.os.Handler; import android.os.Looper; import android.os.Process; import android.os.SystemClock; -import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; +import android.support.v7.preference.PreferenceManager; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; @@ -130,7 +130,8 @@ public class UpdateService extends IntentService { * @see Project Volta: Scheduling jobs */ public static void schedule(Context context) { - int interval = Preferences.get().getUpdateInterval(); + Preferences prefs = Preferences.get(); + long interval = prefs.getUpdateInterval(); if (Build.VERSION.SDK_INT < 21) { Intent intent = new Intent(context, UpdateService.class); @@ -148,13 +149,25 @@ public class UpdateService extends IntentService { } else { Utils.debugLog(TAG, "Using android-21 JobScheduler for updates"); JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); - jobScheduler.cancelAll(); ComponentName componentName = new ComponentName(context, UpdateJobService.class); - JobInfo task = new JobInfo.Builder(0xfedcba, componentName) - .setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED) - .setOverrideDeadline(interval) - .build(); - jobScheduler.schedule(task); + JobInfo.Builder builder = new JobInfo.Builder(0xfedcba, componentName) + .setRequiresDeviceIdle(true) + .setPeriodic(interval); + if (Build.VERSION.SDK_INT >= 26) { + builder.setRequiresBatteryNotLow(true) + .setRequiresStorageNotLow(true); + } + int wifi = prefs.getOverWifi(); + if (prefs.getOverData() == Preferences.OVER_NETWORK_ALWAYS) { + if (Build.VERSION.SDK_INT < 26 || wifi == Preferences.OVER_NETWORK_ALWAYS) { + builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY); + } else { + builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_METERED); + } + } else if (wifi == Preferences.OVER_NETWORK_ALWAYS) { + builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED); + } + jobScheduler.schedule(builder.build()); } } diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java index ec4f3738b..73944d1fa 100644 --- a/app/src/main/java/org/fdroid/fdroid/Utils.java +++ b/app/src/main/java/org/fdroid/fdroid/Utils.java @@ -21,6 +21,7 @@ package org.fdroid.fdroid; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.Signature; import android.content.res.Resources; import android.database.Cursor; import android.graphics.Bitmap; @@ -377,6 +378,26 @@ public final class Utils { return ret; } + /** + * Get the fingerprint used to represent an APK signing key in F-Droid. + * This is a custom fingerprint algorithm that was kind of accidentally + * created, but is still in use. + */ + public static String getPackageSig(PackageInfo info) { + if (info == null || info.signatures == null || info.signatures.length < 1) { + return ""; + } + Signature sig = info.signatures[0]; + String sigHash = ""; + try { + Hasher hash = new Hasher("MD5", sig.toCharsString().getBytes()); + sigHash = hash.getHash(); + } catch (NoSuchAlgorithmException e) { + // ignore + } + return sigHash; + } + /** * There is a method {@link java.util.Locale#forLanguageTag(String)} which would be useful * for this, however it doesn't deal with android-specific language tags, which are a little diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index 4e751bd2d..c89b92185 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -712,10 +712,10 @@ public class App extends ValueObject implements Comparable, Parcelable { */ private void initApkFromApkFile(Context context, Apk apk, PackageInfo packageInfo, SanitizedFile apkFile) throws IOException, CertificateEncodingException { - // TODO include signature hash calculation here if (apkFile.canRead()) { apk.hashType = "sha256"; apk.hash = Utils.getBinaryHash(apkFile, apk.hashType); + apk.sig = Utils.getPackageSig(packageInfo); } initInstalledApk(context, apk, packageInfo, apkFile); } diff --git a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java index 2df49e74d..9548ca057 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java +++ b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java @@ -6,14 +6,12 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.content.pm.Signature; import android.net.Uri; import android.os.Process; import android.support.annotation.Nullable; import android.util.Log; import org.acra.ACRA; import org.fdroid.fdroid.AppUpdateStatusManager; -import org.fdroid.fdroid.Hasher; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.InstalledAppTable; import rx.functions.Action1; @@ -22,7 +20,6 @@ import rx.subjects.PublishSubject; import java.io.File; import java.io.FilenameFilter; -import java.security.NoSuchAlgorithmException; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -310,7 +307,7 @@ public class InstalledAppProviderService extends IntentService { contentValues.put(InstalledAppTable.Cols.VERSION_NAME, packageInfo.versionName); contentValues.put(InstalledAppTable.Cols.APPLICATION_LABEL, InstalledAppProvider.getApplicationLabel(context, packageInfo.packageName)); - contentValues.put(InstalledAppTable.Cols.SIGNATURE, getPackageSig(packageInfo)); + contentValues.put(InstalledAppTable.Cols.SIGNATURE, Utils.getPackageSig(packageInfo)); contentValues.put(InstalledAppTable.Cols.LAST_UPDATE_TIME, packageInfo.lastUpdateTime); contentValues.put(InstalledAppTable.Cols.HASH_TYPE, hashType); @@ -324,25 +321,4 @@ public class InstalledAppProviderService extends IntentService { Uri uri = InstalledAppProvider.getAppUri(packageName); context.getContentResolver().delete(uri, null, null); } - - /** - * Get the fingerprint used to represent an APK signing key in F-Droid. - * This is a custom fingerprint algorithm that was kind of accidentally - * created, but is still in use. - */ - private static String getPackageSig(PackageInfo info) { - if (info == null || info.signatures == null || info.signatures.length < 1) { - return ""; - } - Signature sig = info.signatures[0]; - String sigHash = ""; - try { - Hasher hash = new Hasher("MD5", sig.toCharsString().getBytes()); - sigHash = hash.getHash(); - } catch (NoSuchAlgorithmException e) { - // ignore - } - return sigHash; - } - } \ No newline at end of file diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java index 6ed519855..9fbb8c28a 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java @@ -71,7 +71,7 @@ public class ScreenShotsActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - IMAGE_LOADER.denyNetworkDownloads(false); + IMAGE_LOADER.denyNetworkDownloads(!Preferences.get().isOnDemandDownloadAllowed()); } @Override diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java index 68f25b2c8..3f3410f1f 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java @@ -24,6 +24,9 @@ import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.Schema; +/** + * Provides scrollable listing of apps for search and category views. + */ public class AppListActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks, CategoryTextWatcher.SearchTermsChangedListener { diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index f597f4b7e..b8d5df5c8 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -6,14 +6,15 @@ import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; import android.support.v14.preference.PreferenceFragment; +import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.CheckBoxPreference; import android.support.v7.preference.EditTextPreference; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; +import android.support.v7.preference.SeekBarPreference; import android.text.TextUtils; import android.view.WindowManager; - import info.guardianproject.netcipher.NetCipher; import info.guardianproject.netcipher.proxy.OrbotHelper; import org.fdroid.fdroid.AppDetails2; @@ -29,11 +30,13 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller; public class PreferencesFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { + public static final String TAG = "PreferencesFragment"; private static final String[] SUMMARIES_TO_UPDATE = { - Preferences.PREF_UPD_INTERVAL, - Preferences.PREF_UPD_WIFI_ONLY, - Preferences.PREF_UPD_NOTIFY, + Preferences.PREF_OVER_WIFI, + Preferences.PREF_OVER_DATA, + Preferences.PREF_UPDATE_INTERVAL, + Preferences.PREF_UPDATE_NOTIFICATION_ENABLED, Preferences.PREF_SHOW_ROOT_APPS, Preferences.PREF_SHOW_ANTI_FEATURE_APPS, Preferences.PREF_SHOW_INCOMPAT_VERSIONS, @@ -49,22 +52,48 @@ public class PreferencesFragment extends PreferenceFragment Preferences.PREF_PROXY_PORT, }; + private static final int[] UPDATE_INTERVAL_NAMES = { + R.string.interval_never, + R.string.interval_2w, + R.string.interval_1w, + R.string.interval_1d, + R.string.interval_12h, + R.string.interval_4h, + R.string.interval_1h, + }; + private static final int REQUEST_INSTALL_ORBOT = 0x1234; - private CheckBoxPreference enableProxyCheckPref; - private CheckBoxPreference useTorCheckPref; + + private SeekBarPreference overWifiSeekBar; + private SeekBarPreference overDataSeekBar; + private SeekBarPreference updateIntervalSeekBar; + private SwitchPreference enableProxyCheckPref; + private SwitchPreference useTorCheckPref; private Preference updateAutoDownloadPref; private Preference updatePrivilegedExtensionPref; private long currentKeepCacheTime; - private FDroidApp fdroidApp; + private int overWifiPrevious; + private int overDataPrevious; + private int updateIntervalPrevious; @Override public void onCreatePreferences(Bundle bundle, String s) { + + Preferences.get().migrateOldPreferences(); + addPreferencesFromResource(R.xml.preferences); - useTorCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_USE_TOR); - enableProxyCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_ENABLE_PROXY); + useTorCheckPref = (SwitchPreference) findPreference(Preferences.PREF_USE_TOR); + enableProxyCheckPref = (SwitchPreference) findPreference(Preferences.PREF_ENABLE_PROXY); updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES); updatePrivilegedExtensionPref = findPreference(Preferences.PREF_UNINSTALL_PRIVILEGED_APP); + overWifiSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_OVER_WIFI); + overWifiPrevious = overWifiSeekBar.getValue(); + overDataSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_OVER_DATA); + overDataPrevious = overDataSeekBar.getValue(); + updateIntervalSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_UPDATE_INTERVAL); + updateIntervalPrevious = updateIntervalSeekBar.getValue(); + ListPreference languagePref = (ListPreference) findPreference(Preferences.PREF_LANGUAGE); if (Build.VERSION.SDK_INT >= 24) { PreferenceCategory category = (PreferenceCategory) findPreference("pref_category_display"); @@ -78,7 +107,7 @@ public class PreferencesFragment extends PreferenceFragment } private void checkSummary(String key, int resId) { - CheckBoxPreference pref = (CheckBoxPreference) findPreference(key); + Preference pref = findPreference(key); pref.setSummary(resId); } @@ -94,28 +123,56 @@ public class PreferencesFragment extends PreferenceFragment pref.setSummary(getString(resId, pref.getText())); } + private void setNetworkSeekBarSummary(SeekBarPreference seekBarPreference) { + int position = seekBarPreference.getValue(); + if (position == 0) { + seekBarPreference.setSummary(R.string.over_network_never_summary); + } else if (position == 1) { + seekBarPreference.setSummary(R.string.over_network_on_demand_summary); + } else if (position == 2) { + seekBarPreference.setSummary(R.string.over_network_always_summary); + } else { + throw new IllegalArgumentException("No such " + seekBarPreference.getTitle() + " position: " + position); + } + } + + private void enableUpdateInverval() { + if (overWifiSeekBar.getValue() == Preferences.OVER_NETWORK_NEVER + && overDataSeekBar.getValue() == Preferences.OVER_NETWORK_NEVER) { + updateIntervalSeekBar.setEnabled(false); + updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[0]); + } else { + updateIntervalSeekBar.setEnabled(true); + updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[updateIntervalSeekBar.getValue()]); + } + } + private void updateSummary(String key, boolean changing) { switch (key) { - case Preferences.PREF_UPD_INTERVAL: - ListPreference listPref = (ListPreference) findPreference( - Preferences.PREF_UPD_INTERVAL); - int interval = Integer.parseInt(listPref.getValue()); - Preference onlyOnWifi = findPreference( - Preferences.PREF_UPD_WIFI_ONLY); - onlyOnWifi.setEnabled(interval > 0); - if (interval == 0) { - listPref.setSummary(R.string.update_interval_zero); - } else { - listPref.setSummary(listPref.getEntry()); - } + + case Preferences.PREF_UPDATE_INTERVAL: + updateIntervalSeekBar.setMax(Preferences.UPDATE_INTERVAL_VALUES.length - 1); + updateIntervalSeekBar.setDefaultValue(Preferences.DEFAULT_UPDATE_INTERVAL); + int seekBarPosition = updateIntervalSeekBar.getValue(); + updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[seekBarPosition]); break; - case Preferences.PREF_UPD_WIFI_ONLY: - checkSummary(key, R.string.automatic_scan_wifi_on); + case Preferences.PREF_OVER_WIFI: + overWifiSeekBar.setMax(Preferences.OVER_NETWORK_ALWAYS); + overWifiSeekBar.setDefaultValue(Preferences.DEFAULT_OVER_WIFI); + setNetworkSeekBarSummary(overWifiSeekBar); + enableUpdateInverval(); break; - case Preferences.PREF_UPD_NOTIFY: + case Preferences.PREF_OVER_DATA: + overDataSeekBar.setMax(Preferences.OVER_NETWORK_ALWAYS); + overDataSeekBar.setDefaultValue(Preferences.DEFAULT_OVER_DATA); + setNetworkSeekBarSummary(overDataSeekBar); + enableUpdateInverval(); + break; + + case Preferences.PREF_UPDATE_NOTIFICATION_ENABLED: checkSummary(key, R.string.notify_on); break; @@ -123,10 +180,10 @@ public class PreferencesFragment extends PreferenceFragment entrySummary(key); if (changing) { Activity activity = getActivity(); - fdroidApp = (FDroidApp) activity.getApplication(); + FDroidApp fdroidApp = (FDroidApp) activity.getApplication(); fdroidApp.reloadTheme(); fdroidApp.applyTheme(activity); - fdroidApp.forceChangeTheme(activity); + FDroidApp.forceChangeTheme(activity); } break; @@ -190,7 +247,7 @@ public class PreferencesFragment extends PreferenceFragment break; case Preferences.PREF_ENABLE_PROXY: - CheckBoxPreference checkPref = (CheckBoxPreference) findPreference(key); + SwitchPreference checkPref = (SwitchPreference) findPreference(key); checkPref.setSummary(R.string.enable_proxy_summary); break; @@ -371,6 +428,13 @@ public class PreferencesFragment extends PreferenceFragment super.onPause(); getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this); Preferences.get().configureProxy(); + + if (updateIntervalPrevious != updateIntervalSeekBar.getValue()) { + UpdateService.schedule(getActivity()); + } else if (Build.VERSION.SDK_INT >= 21 && + (overWifiPrevious != overWifiSeekBar.getValue() || overDataPrevious != overDataSeekBar.getValue())) { + UpdateService.schedule(getActivity()); + } } @Override @@ -385,5 +449,4 @@ public class PreferencesFragment extends PreferenceFragment } } } - } diff --git a/app/src/main/res/layout/preference_seekbar.xml b/app/src/main/res/layout/preference_seekbar.xml new file mode 100644 index 000000000..87b4c0ccc --- /dev/null +++ b/app/src/main/res/layout/preference_seekbar.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index ba3a5f903..6ec51fa07 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -15,10 +15,6 @@ Ander Automatiese opdaterings interval - Geen automatiese prgram lys opdaterings - Slegs op Wi-Fi - Opdateer slegs automaties wanneer gekoppel aan ongemete netwerke soos Wi-Fi - Automatise opdaterings Opdateerings word outomaties afgelaai en jy word in kennis gestel om dit self te installeer Installeer opdaterings automaties diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 05f3587c1..f277f63a4 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -67,11 +67,6 @@ أخرى تحديث الفاصل الزمني التلقائي - لا توجد تحديثات لقائمة التطبيق التلقائي - فقط على الشبكات اللاسلكية (Wi-Fi) - تحديث قوائم التطبيق تلقائيا فقط على الشبكات غير المحدودة بمقدار البيانات مثل - (Wi-Fi) - جلب التحديثات تلقائياً التحديثات تُحمل تلقائياً و أنت تتلقي إشعار لتثبيتها إظهار التحديثات المتوفرة diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index cc1889180..d89e4c0a0 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -9,9 +9,6 @@ Anovamientos Otru Intervalu automáticu d\'anovamientu - Nun anovar automáticamente\'l llistáu d\'aplicaciones - Namái na Wi-Fi - Auto-anovar namái en redes non midíes como Wi-Fi Ver los anovamientos disponibles Amuesa un avisu cuando tán disponibles anovamientos Estensión con privilexos diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index e97a2b4a3..ea3eaa5a8 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -19,9 +19,6 @@ Іншае Інтэрвал аўтаматычнага абнаўлення - Не абнаўляць спіс праграм аўтаматычна - Толькі праз Wi-Fi - Аўтаматычна абнаўляць толькі праз нелімітаваныя сеткі, такія як Wi-Fi Аўтаматычна атрымліваць абнаўленні Абнаўленні спампуюцца аўтаматычна і вам будзе прапанавана ўсталяваць іх Аўтаматычна ўсталёўваць абнаўленні diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5fb00f9c4..8ceeb1ad7 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -12,11 +12,6 @@ Обновления Други Проверка за актуализации - Без автоматично актуализиране на списъка с приложения - Само през Wi-Fi - Актуализирането на списъка с приложения ще става само през неограничени мрежи - като Wi-Fi - Покажи наличните актуализации Известява при наличие на актуализация Инсталиране чрез системни разрешения diff --git a/app/src/main/res/values-bo/strings.xml b/app/src/main/res/values-bo/strings.xml index 4506217c6..68a3f10fc 100644 --- a/app/src/main/res/values-bo/strings.xml +++ b/app/src/main/res/values-bo/strings.xml @@ -85,9 +85,6 @@ གཞན། རང་འགུལ་ངང་ནས་གསར་བསྒྱུར་བར་མཚམས། - རང་འགུལ་མ་ཡིན་པའི་མཉེས་ཆས་གསར་བསྒྱར་གྱི་ཐོ་གཞུང་། - ཝཡེ་ཕྷཡེ་ཁོ་ནའི་སྒང་ལ། - ཝཡེ་ཕཡེ་ལྟ་བུ་ཚད་འཇལ་མི་ཐུབ་པའི་རིགས་ལ་རང་འགུལ་གྱི་གསར་བསྒྱུར་ཁོ་ན་བྱེད་དགོས། རང་འགུལ་ངང་ནས་གསར་བསྒྱར་ལེན། རང་འགུལ་གྱི་ངང་ནས་གསར་བསྒྱུར་དང་ཕབ་ལེན་བྱས་པ་དང་ཁྱེད་རང་ལ་བརྡ་ལན་འབྱོར་སྐབས་དེ་དག་འགྲིག་བཅུག་བྱེད། རང་འགུལ་གྱི་ཐོག་ནས་གསར་བསྒྱུར་རྣམས་འགྲིག་བཅུག་བྱེད། diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 538d55ad4..e33f703b1 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -8,9 +8,6 @@ Actualitzacions Altres Període d\'actualització automàtica - No actualitzis automàticament la llista d\'aplicacions - Només en Wi-Fi - Actualitza la llista d\'aplicacions en xarxes sense limitació de tràfic, com ara Wi-Fi Mostreu les actualitzacions disponibles Ensenya una notificació quan hi hagi actualitzacions disponibles Extensió Privilegiada diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index cde7dcbb9..5d4da6331 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -8,9 +8,6 @@ Aktualizace Ostatní Interval automatických aktualizací - Pouze přes Wi-Fi - Automaticky aktualizovat jen na nezpoplatněných sítích, jako např. Wi-Fi - Zobrazit dostupné aktualizace Upozornit, pokud jsou dostupné aktualizace Privilegovaná rozšíření @@ -282,7 +279,6 @@ Světlý Tmavý Noc - Bez automatických aktualizací seznamu aplikací Privilegovaná oprávnění nebyla tomuto rozšíření udělena! Nahlašte prosím jako chybu! diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f6f1ff92e..4e3864c0f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -14,9 +14,6 @@ Andet Automatisk opdateringsinterval - Ingen automatiske opdateringer til applikationslisten - Kun på Wi-Fi - Opdater kun automatisk på ubegrænsede netværk som WI-FI Vis tilgængelige opdateringer Vis en notifikation når opdateringer er tilgængelige Privilegeret Udvidelse diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 503de28d6..b58ec41bf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,11 +9,6 @@ Aktualisierungen Andere Automatisches Aktualisierungsintervall - Anwendungsliste nicht automatisch aktualisieren - Nur über WLAN - Anwendungsliste nur über gebührenfreie Netze wie WLAN automatisch - aktualisieren - Aktualisierungsbenachrichtigung Benachrichtigen, wenn Aktualisierungen verfügbar sind Rechteerweiterung diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 08a0dae50..dae391b68 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -9,9 +9,6 @@ Ενημερώσεις Άλλα Συχνότητα ενημέρωσης - Μη αυτόματη ενημέρωση της λίστας εφαρμογών - Μόνο σε Wi-Fi - Αυτόματη ενημέρωση μόνο σε δίκτυα Wi-Fi Εμφάνιση διαθέσιμων ενημερώσεων Εμφάνιση ειδοποίησης όταν υπάρχουν διαθέσιμες ενημερώσεις Λεπτομέρειες Εφαρμογής diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 342dfbe8a..9732e03f2 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -4,7 +4,6 @@ Forigi Ĝisdatigoj Aliaj - Nur per vifio Montri disponeblajn ĝisdatigojn Sciigi kiam ĝisdatigoj estas disponeblaj Aplikaĵaj detaloj @@ -99,8 +98,6 @@ Aktivigi sendadon tra NFC… Kaŝmemorigi apk-dosierojn Proponi ĝisdatigojn al nestabilaj versioj - Neniam aŭtomate ĝisdatigi listojn de aplikaĵoj - Ĝisdatigi listojn aŭtomate nur per netarifaj retoj kiel vifio Privilegia aldonaĵo Uzi privilegian F-Droid-aldonaĵon por instali, ĝisdatigi kaj forigi pakaĵojn diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 765380282..89a6f8a07 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,10 +9,6 @@ Avisos Otros Intervalo de actualización automática - No actualizar la lista de aplicaciones automáticamente - Sólo con Wi-Fi - Actualizar automáticamente solo con Wi-Fi y otras redes de tarifa plana - Mostrar actualizaciones disponibles Muestra una notificación cuando hay actualizaciones Extensión con permisos de sistema diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 9b2374d71..dbfae9551 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -14,9 +14,6 @@ Muu Automaatne värskendusintervall - Ära värskenda rakenduste loendit automaatselt - Ainult Wi-Fi ühendusega - Värskenda rakenduste loendit automaatselt piiramatu andmemahuga võrkudes nagu Wi-Fi Värskenduste automaatne hankimine Värskendused laaditakse automaatselt ja sind teavitatakse, et neid paigaldada Kuva saadaolevad värskendused diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index adb61e044..a4af244b0 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -9,10 +9,6 @@ Gaitu NFC bidez bidaltzea… Gorde aplikazioak cachean Eguneraketak - Wi-Fi bidez soilik - Eguneratu aplikazioen zerrendak automatikoki Wi-Fi bezalako mugatu gabeko - sareen bidez soilik - Erakutsi eguneraketa eskuragarriak Bistarazi jakinarazpena eguneraketak eskuragarri daudenean Aplikazioaren xehetasunak @@ -150,7 +146,6 @@ Biltegi guztiak egunean daude Beste biltegiek ez dute errorerik sortu. Errorea eguneratzean: %s - Ez eguneratu automatikoki aplikazio zerrenda Bitcoin Litecoin Flattr diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 95ccd1637..2bd8f5d84 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -6,9 +6,6 @@ به‌روزرسانی‌ها دیگر به‌روزرسانی دوره‌ای خودکار - به‌روزرسانی‌ نکردن خودکار فهرست برنامه‌ ها - فقط روی وای‌فای - به‌روز رسانی خودکار فقط روی شبکه‌های اندازه‌گیری نشده مثل وای‌فای نمایش یک اعلان هنگام موجود بودن به‌روز رسانی‌ها چنین کاره‌ای پیدا نشد. دربارهٔ F-Droid diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 947a84f0e..9d273e44d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -9,9 +9,6 @@ Päivitykset Muu Automaattisen päivityksen tiheys - Ei automaattisia sovellusluetteloiden päivityksiä - Vain Wi-Fi -yhteydellä - Päivitä automaattisesti vain rajoittamattomissa verkoissa, kuten Wi-Fi Päivitysimoitukset Näytä iIlmoitus, kun päivityksiä on saatavilla Etuoikeutettu laajennus diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a3076947c..f0cf51f98 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -9,9 +9,6 @@ Mises à jour Autres Intervalle de mise à jour automatique - Aucune mise à jour automatique de la liste d\'applis - Uniquement via Wi-Fi - Mise à jour automatique uniquement sur des réseaux sans restriction, comme le Wi-Fi Afficher les mises à jour disponibles Afficher une notification quand des mises à jour sont disponibles Permissions étendues diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index b170bec90..7f20f3d52 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -6,7 +6,6 @@ Manter apps na caché Actualizacións Outro - Só mediante wifi Amosar actualizacións disponíbeis Detalles da ap Non se atopou ese aplicativo. @@ -64,7 +63,6 @@ Activar envío NFC… Actualizacións inestables Intervalo de actualización automática - Actualizar automáticamente só en redes con acceso ilimitado, como as Wi-Fi Amosar unha notificación cando hai actualizacións dispoñibles Utiliza F-Droid Privileged Extension para instalar, actualizar e eleminar paquetes @@ -212,7 +210,6 @@ Oscuro Nocturno Suxire actualizacións para versións inestables - Non actualizar automáticamente o listado de aplicativos Abre a pantalla de detalles da Privileged Extension para actualizala/desinstalala diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 438fdbd27..e52efa120 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -9,8 +9,6 @@ אחר תדירות עדכון אוטומטי - רק על גבי רשת אלחוטית - עדכון רשימות יישומונים אוטומטית רק על גבי רשת אלחוטית הצגת עדכונים זמינים הצגת התרעה כאשר יש עדכונים הרחבה מועדפת @@ -273,7 +271,6 @@ להתקין עדכון ליישומון מובנה זה? המידע הנוכחי שלך לא יאבד. היישומון העדכני יקבל גישה אל: להתקין עדכון ליישומון קיים זה? המידע הנוכחי שלך לא יאבד. פעולה זו אינה מצריכה הרשאת גישה מיוחדת. להתקין עדכון ליישומון מובנה זה? המידע הנוכחי שלך לא יאבד. פעולה זו אינה מצריכה גישה מיוחדת. - אין עדכוני רשימות יישומונים אוטומטית Bitcoin Litecoin Flattr diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 897f473e3..c6e90646f 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -9,9 +9,6 @@ अन्य स्वचालित अद्यतन अंतराल - कोई स्वचालित एप्लिकेशन अद्यतन नहीं - केवल Wi-Fi - एप्लिकेशन सूचि केवल Wi-Fi पे अपडेट करें नवीनतम सूचनाएं सूचित कर्रे जब नवीनतम उपलब्ध हो स्थानीय कोष का नाम diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 04eba82e3..0fa66975d 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -19,9 +19,6 @@ Ostalo Interval automatskog ažuriranja - Bez automatskog ažuriranja popisa aplikacija - Samo na Wi-Fi - Ažuriraj popis aplikacija automatski samo na Wi-Fi Automatski preuzmi ažuriranja Preuzmi datoteke ažuriranja u pozadini Obavijesti ažuriranja diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0df166b5b..5383b8cb9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -7,9 +7,6 @@ Frissítések Egyéb Automatikus frissítés időköze - Ne frissítsen automatikusan - Csak Wi-Fin - Automatikus frissítés csak forgalomkorlát nélküli kapcsolatokon, például Wi-Fin Elérhető frissítések megjelenítése Értesítés megjelenítése, ha frissítés érhető el Alkalmazás részletei diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml index e3e79a05a..4e320f6f2 100644 --- a/app/src/main/res/values-hy/strings.xml +++ b/app/src/main/res/values-hy/strings.xml @@ -135,7 +135,6 @@ Տեղադրել Պահել տեղադրման և ապատեղադրման լոգերը F-Droidում - Միայն Wi-Fiով Թարմացման ծանուցումներ Երբ թարմացում է հասանելի՝ ցույց տալ ծանուցում Այդպիսի ափփ չի գտնվել diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index ff62f40b9..26a376ded 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -13,10 +13,6 @@ Lainnya Selang waktu pembaruan otomatis - Jangan perbarui otomatis daftar aplikasi - Hanya pada Wi-Fi - Hanya perbarui secara otomatis pada jaringan tak terbatas seperti Wi-Fi - Tampilkan pembaruan yang tersedia Beri tahu jika pembaruan aplikasi tersedia Gunakan F-Droid Privileged Extension untuk memasang, memperbarui, dan mencopot diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index b965ab4b8..eaae1bc3d 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -12,7 +12,6 @@ Annað Bil milli sjálfvirkra uppfærslna - Aðeins á þráðlausu neti Ná sjálfkrafa í uppfærslur Sækja uppfærsluskrárnar í bakgrunni og þú færð tilkynningu um að setja þær upp Setja uppfærslur upp sjálfkrafa @@ -264,10 +263,6 @@ Tengstu sama þráðlausa Wi-Fi netinu og vinur þinn Tengstu fólki í nágrenninu og skipstu á forritum við það. QR-kóðinn sem þú skannaðir lítur ekki út eins og býttikóði. - Engar sjálfvirkar uppfærslur forritalista - Einungis uppfæra sjálfvirkt þegar tengst er kostnaðarlausum netkerfum á borð - við Wi-Fi netum - Nota forgangsviðbót F-Droid (privileged extension) til að setja upp, uppfæra og fjarlægja pakka diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 12ca323aa..299868716 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -12,9 +12,6 @@ Aggiornamenti Altro Intervallo degli aggiornamenti automatici - Non aggiornare automaticamente l\'elenco delle applicazioni - Solo via Wi-Fi - Aggiorna automaticamente gli elenchi applicazioni solo via Wi-Fi Mostra aggiornamenti disponibili Mostra una notifica quando sono disponibili aggiornamenti Estensione priviliegiata diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ee0391a03..1971078c0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -9,9 +9,6 @@ アップデート その他 自動更新の間隔 - アプリリストの自動更新を行わない - Wi-Fi接続時のみ - Wi-Fiなどの従量課金制ではないネットワークのみで自動更新を行います 利用可能な更新を表示 アップデートが利用可能になると通知を表示します 特権拡張機能 diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 6af7e20b4..e131678fb 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -201,7 +201,6 @@ Rmed Tuzna NFC … Ileqman ur yerkiden ara Ḥrez amazray n usebded - Ala γef Wi-Fi Sken ileqman yellan Isiγzaf Yettwasirgen Leqqem/Kkes asiγzef yettwasirgen diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 429e8c1b2..9a076096a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -9,9 +9,6 @@ 업데이트 기타 자동 업데이트 간격 - 자동으로 앱 목록을 업데이트하지 않기 - Wi-Fi에서만 - Wi-Fi와 같이 추가 요금이 부과되지 않는 네트워크에서만 자동으로 업데이트합니다 사용 가능한 업데이트 보이기 업데이트가 사용 가능할 때 알림을 보여줍니다 특별 권한 확장 기능 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 4d2bfcafa..03c0d33ad 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -6,7 +6,6 @@ Atnaujinimai Kita Automatinis programų sąrašų naujinimas - Tik prisijungus prie belaidžio (WiFi) Informuoti Pranešti, kai atsiras atnaujinimų Šio įrenginio saugyklos pavadinimas @@ -133,6 +132,5 @@ Saugoti įdiegimų istoriją Saugoti log bylą visiems įdiegimams ir išdiegimams F-Droid programėlėje Priversti senąjį indeksavimo formatą - Nėra automatinio programėlių sąrašo atnaujinimų Atnaujinimai parsiunčiami automatiškai o Jūs perspėjami juos instaliuoti diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index b429f4356..dbc943ed0 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -7,9 +7,6 @@ Atjauninājumi Cits Automātisko atjauninājumu intervāls - Neatjaunināt aplikāciju sarakstu automātiski - Tikai pa Wi-Fi - Atjaunināt automātiski tikai tīklos bez limitiem, kā, piemēram, Wi-Fi Parādīt pieejamos atjauninājumus Ziņot, kad atjauninājumi pieejami Priviliģētais Pievienojums diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index b4018dc12..8bcd4056e 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -20,6 +20,4 @@ Други Автоматско ажурирање временски интервал - Нема листа на автоматски ажурирања на апликацијата - Само на Wi-Fi diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 3e2e4d5d9..5be46bee0 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -93,9 +93,6 @@ മറ്റുള്ളവ സ്വതവേ പുതുക്കലിന്റെ ഇടവേള - പ്രയോഗ പട്ടിക സ്വതവേ പുതുക്കേണ്ട - വൈ-ഫൈ യിൽ മാത്രം - വൈഫൈ പോലെ പരിധിയില്ലാത്ത ശൃഖലകളിൽ മാത്രം സ്വതവേ പുതുക്കുക പുതുക്കലുകള്‍ സ്വതവേ ലഭ്യമാക്കുക പുതുക്കലുകള്‍ സ്വതവേ ഡൗൺലോഡ് ചെയ്യുകയും അവ സ്ഥാപിക്കാന്‍ നിങ്ങളെ വിവരം അറിയിക്കുകയും ചെയ്യുക പുതുക്കലുകള്‍ സ്വതവേ സ്ഥാപിക്കുക diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index 470c24f08..4eb88bdcd 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -17,9 +17,6 @@ တျခား အလိုအေလ်ာက္ အသစ္မြမ္းမံမႈ interval - အလိုအေလ်ာက္ app စာရင္းအသစ္မြမ္းမံမႈမ်ားမေတြ႕ရပါ - ဝိုင္ဖိုင္ျဖင့္သာ - ဝိုင္ဖိုင္ျဖင့္သာ app စာရင္းမ်ားကိုအလိုအေလ်ာက္ျပဳလုပ္မည္ အသစ္မြမ္းမံမႈမ်ားကိုအလိုအေလ်ာက္ေဒါင္းလုတ္ဆြဲမည္ အေနာက္ပိုင္းတြင္ အသစ္မြမ္းမံမႈမ်ားကိုေဒါင္းလုတ္ဆြဲမည္ အသစ္မြမ္းမံမႈ အသိေပးခ်က္မ်ား diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 93e5b6590..e78551098 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -8,9 +8,6 @@ Oppdateringer Andre Intervall for automatisk oppdatering - Ingen automatisk oppdatering av pakkebrønner - Bare på trådløst - Bare oppdater automatisk når tilknyttet Wi-Fi Vis tilgjengelig oppdateringer Varsle når nye oppdateringer er tilgjengelige Priviligert tillegg diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml index d6e71eb03..7fdc9bc8b 100644 --- a/app/src/main/res/values-nl-rBE/strings.xml +++ b/app/src/main/res/values-nl-rBE/strings.xml @@ -95,9 +95,6 @@ Overig Automatisch update-interval - Geen automatische applijstupdates - Alleen via wifi - Alleen automatisch bijwerken op verbindingen zonder datalimiet gelijk wifi Download updates automatisch Updates worden automatisch gedownload in de achtergrond en der wordt een melding weergegeven voor ze te installeren Installeer updates automatisch diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eda4a9c56..e92128f54 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -9,9 +9,6 @@ Updates Overig Automatisch update-interval - Geen automatische app-lijstupdates - Alleen via wifi - Update alleen automatisch op verbinding zonder datalimiet zoals wifi Toon beschikbare updates Toon een melding wanneer er updates beschikbaar zijn Systeemrechtenextensie diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b461ff3f0..ca382946a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -123,9 +123,6 @@ usunięcie jej danych i ustawień) Okres pomiędzy sprawdzaniem aktualizacji - Aktualizuj tylko przez Wi-Fi - Aktualizuj listę aplikacji tylko przez nietaryfowe połączenia, np. Wi-Fi - Wyświetlaj powiadomienie gdy znalezione zostaną nowe aktualizacje Aktualizuj/odinstaluj uprzywilejowany dodatek F-Droida Pokaż szczegóły uprzywilejowanego dodatku @@ -198,7 +195,6 @@ Wymiana powiodła się! %1$s (Twój hostpot) Dotknij by połączyć się z tą inną siecią Wi-Fi - Wyłącz automatyczne aktualizacje Kod źródłowy Twoje urządzenie nie jest w tej samej sieci Wi-Fi co lokalne repozytorium które zostało dodane! Spróbuj połączyć się z siecią %s diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 883d4774b..e93d3c90d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -12,10 +12,6 @@ Atualizações Outros Intervalo de atualização automática - Não atualizar a lista de aplicativos automaticamente - Apenas com Wi-Fi - Atualizar automaticamente apenas em redes com acesso ilimitado, como Wi-Fi - Mostras atualizações disponíveis Mostrar uma notificação quando atualizações estiverem disponíveis Extensão privilegiada diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2b400aaec..4744ce870 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -17,10 +17,6 @@ Outro Intervalo de atualização automática - Não atualizar automaticamente a lista de aplicações - Apenas por Wi-Fi - Apenas atualizar a lista de aplicações se estiver ligado a redes Wi-Fi - Mostrar atualizações disponíveis Mostrar uma notificação se existirem atualizações disponíveis Extensão privilegiada diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f028ffb29..9492680e2 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -42,7 +42,6 @@ Activează trimiterea prin NFC… Interval actualizări automate - Doar prin Wi-Fi Actualizări instabile Nume utilizator Parola @@ -51,11 +50,9 @@ Necesită autentificare Extensie privilegiată Sugerează actualizări și la versiunile instabile - Nu actualiza automat lista de pachete Nume utilizator gol, autentificare neschimbată Schimbă parola - Actualizează automat doar prin rețele necontorizate precum Wi-Fi Numele depozitului local Titlu depozitului local folosit la anunțare: %s Arată o notificare atunci când există actualizări ale aplicațiilor diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9740f18b8..9c44b9c01 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -9,11 +9,6 @@ Обновления Прочее Интервал автоматического обновления - Не обновлять список приложений автоматически - Только по Wi-Fi - Обновлять автоматически только по нелимитированным соединениям (таким как - Wi-Fi) - Показывать доступные обновления Отображать уведомление когда есть обновления Привилегированное расширение diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 408213ca3..eeac107af 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -9,11 +9,6 @@ Agiornamentos Àteru Intervallu agiornamentu automàticu - Non che agiornes automaticamente sa lista de sas aplicatziones - Cun su Wi-Fi ebbia - Agiorna automaticamente sa lista de sas aplicatziones petzi si b\'est su - wifi - Ammustra sos agiornamentos disponìbiles Averte cando bi sunt agiornamentos disponìbiles Estensione cun permissos de sistema diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 42f2afa69..c5b96c18b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -14,10 +14,6 @@ Obnovy Iné Interval automat. aktualizácií - Automaticky neobnovovať zoznam - Iba cez Wi-Fi - Automaticky aktualizovať len na nespoplatnených sieťach, ako napr. Wi-Fi - Zobraziť dostupné aktualizácie Upozorniť na dostupnosť aktualizácií Ukladať balíky do vyr. pamäte diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 1146abade..e737f7314 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -47,9 +47,6 @@ Ostalo Interval samodejnega posodabljanja - Samodejno osveževanje seznama aplikacij onemogočeno - Samo na Wi-Fi - Posodobi seznam aplikacij samo na Wi-Fi Prikaži obvestilo, ko so na voljo posodobitve Nazaj Nastavitve diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml index 1fb85db94..4f52a9cfa 100644 --- a/app/src/main/res/values-sn/strings.xml +++ b/app/src/main/res/values-sn/strings.xml @@ -11,9 +11,6 @@ meF-Droid Chimirwa chakanatswa chiri automatic - Hapana mitara iri automatic yezvakanatswa zvema app - Pamasaisai eWi-Fi chete - Natsa zviriautomatic pamasaisai asiri metered kunge Wi-Fi chete Tutunura zvekunatsa zviri automatic Tutunura faira rekunatsa kuseri kwezvaurikuita iyezvino Vakirira zvekunatsa zviri automatic diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 45e176d4b..b8c61bd0f 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -13,7 +13,6 @@ Tjetër Intervali i përditësimeve automatike - Vetëm me Wi-Fi Rreth F-Droid Verzioni: Burimi i kodit: @@ -122,8 +121,6 @@ Mbaje raportin e të gjitha instalimeve dhe çinstalimeve mbrenda F-Droid Forcoje formën e vjetër të indeksit Në rast të gabimeve ose problemeve të pajtueshmërisë, përdoreni XML indeksin e aplikacioneve - Mos të freskohet lista e aplikacioneve - Freskoje vetëm në rrjete të pamatura si Wi-Fi Merr freskimet automatikisht Freskimet shkarkohen automatikisht dhe ti njoftohesh për të instaluar ato Automatikisht instaloje freskimet diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 97dca789f..84ee88ec2 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -11,9 +11,6 @@ Надоградње Остало Међувреме самосталног освежавања - Без самосталног освежавања списка надоградњи - Само на бежичној мрежи - Самостално освежавање само на бесплатним мрежама као што је бежична Прикажи доступне надоградње Приказ обавештења о доступним надоградњама Повлашћено проширење diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index dad729a02..8f67a7cf4 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -9,9 +9,6 @@ Uppdateringar Andra Automatiskt uppdateringsintervall - Inga automatiska applistuppdateringar - Endast via Wi-Fi - Uppdatera endast automatiskt på obegränsade nätverk som Wi-Fi Visa tillgängliga uppdateringar Visa avisering när uppdateringar finns tillgängliga Privilegierad utökning diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 3a7d8cc5f..74a9d8cce 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -10,8 +10,6 @@ உறுதியற்ற மேம்பாடுகள் பிற - Wi-Fi-யில் மட்டும் - செயலி பட்டியலை Wi-Fi-யில் மட்டும் தானாக புதுப்பி மேம்பாடுகளை தானாக தறவிறக்கு மேம்படுத்தலுக்கான அறிவிப்புகள் மேம்படுத்தல்கள் கிடைக்கப்பெறும் பொழுது அறிவிப்புகளை காண்பி diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 166a185ba..657e97b8b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -10,7 +10,6 @@ อื่นๆ อัพเดตข้อมูลอัตโนมัติทุกๆ - เฉพาะตอนมีสัญญาณ WiFi ดาวน์โหลดอัพเดตโดยอัตโนมัติ ชื่อที่ตั้งให้แหล่งโปรแกรมจากเครื่องคุณ ชื่อผู้ใช้ @@ -241,8 +240,6 @@ อัพเดต อัพเดตที่ไม่เสถียร แนะนำการอัพเดตไปรุ่นที่ไม่เสถียร - ไม่อัพเดตข้อมูลรายการโปรแกรมโดยอัตโนมัติ - อัพเดตข้อมูลรายการโปรแกรมเฉพาะตอนที่ใช้ WiFi ทำการดาวน์โหลดอัพเดตโปรแกรมแบบเบื้องหลัง การแจ้งเตือนอัพเดต แสดงการแจ้งเตือนเมื่อมีอัพเดตให้ดาวน์โหลด diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b1541e6cd..a9a186b96 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -9,9 +9,6 @@ Güncellemeler Diğer Kendiliğinden güncelleme aralığı - Kendiliğinden uygulama listesi güncellemesi olmasın - Yalnızca Wi-Fi ile - Yalnızca Wi-Fi gibi ölçümsüz ağlarda kendiliğinden güncelle Kullanılabilir güncellemeleri göster Güncellemeler varsa bir bildirim göster Ayrıcalıklı Uzantı diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml index a9e242f83..f3ddee1b6 100644 --- a/app/src/main/res/values-ug/strings.xml +++ b/app/src/main/res/values-ug/strings.xml @@ -10,7 +10,6 @@ ئەپلەر غەملەككە چۈشۈرۈلدى يېڭىلانمىلار باشقا - wifi دىلا ئۇقتۇرۇش ئەپ تەپسىلاتلىرى بۇنداق ئەپ تېپىلمىدى diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 56a199e10..bc11a231d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -38,9 +38,6 @@ Видалити Інше Інтервал автооновлення - Не оновлювати список застосунків автоматично - Тільки через Wi-Fi - Автоматично оновлювати тільки через нелімітовані мережі, такі як Wi-Fi Показувати сповіщення коли є доступні оновлення Привілейоване розширення Використовувати привілейоване розширення F-Droid для встановлення, оновлення та diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index ca49c918b..681a3cbbd 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -19,9 +19,6 @@ دیگر خودکار تازہ کاری کرنے کا وقفہ - کوئی خودکار ایپ فہرست تازہ کاریاں موجود نہیں - صرف وائی فائی پر - اپلی کیشن کی فہرست صرف وائی فائی پر خود بخود اپڈیٹ کریں تازہ کاریوں کی اطلاعات اگر تازہ کاری دستیاب ہیں تو اطلاع دیں پریولجڈ ایکس ٹینشن diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3b03b47c5..1c23f07b1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -11,9 +11,6 @@ Cập nhật Khác Tự động cập nhật định kì - Không tự động cập nhật danh sách ứng dụng - Chỉ khi dùng Wi-Fi - Chỉ tự động cập nhật khi dùng các mạng không tính lưu lượng, ví dụ Wi-Fi Hiện các bản cập nhật có sẵn Hiện thông báo khi có bản cập nhật Phần mở rộng được cấp quyền diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2bb4bb6e9..9f627641c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -9,9 +9,6 @@ 更新 其他 自动更新频率 - 不要自动更新应用列表 - 仅在Wi-Fi上 - 仅在使用 Wi-Fi 等非计量网络时自动更新 显示可用更新 应用可供更新时显示通知 特权扩展 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index bfbbd4b64..8436ca84e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -7,9 +7,6 @@ 更新 其他 自動更新頻率 - 不要自動更新應用程式目錄 - 只透過 Wi-Fi 更新 - 只在使用如 Wi-Fi 等沒有限流量的連線時自動更新 顯示可更新的應用程式 應用程式發佈更新時通知我 系統權限套件 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4aaf7dec6..513341a50 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -14,9 +14,6 @@ 其它設定 自動更新間隔 - 不要自動更新應用程式清單 - 僅使用 Wi-Fi 更新 - 僅在未計量的網路例如 Wi-Fi 上自動更新 顯示可用的更新 當有可用更新時顯示通知 本地端軟體庫名稱 diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index c575ea5a4..7842fb2df 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -1,15 +1,5 @@ - - @string/interval_never - @string/interval_1h - @string/interval_4h - @string/interval_12h - @string/interval_1d - @string/interval_1w - @string/interval_2w - - @string/keep_hour @string/keep_day diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 1de33474f..09fe45d56 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -19,16 +19,6 @@ 1-THIS MEANS NO APP IS GRANTED ACCESS! @string/install_history_reader_packageName_UNSET - - 0 - 1 - 4 - 12 - 24 - 168 - 336 - - 3600000 86400000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67f5475b9..f8181bc7f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,9 +23,11 @@ Other Automatic update interval - No automatic app list updates - Only on Wi-Fi - Only update automatically on unmetered networks like Wi-Fi + Over Wi-Fi + Over data + Always use this connection when available + Only use this connection when I click to download + Never download anything using this connection Automatically fetch updates Updates are downloaded automatically and you are notified to install them @@ -186,7 +188,7 @@ This often occurs with apps installed via Google Play or other sources, if they No categories to display My Apps - Manage Installed Apps + Manage installed apps Not installed @@ -242,7 +244,7 @@ This often occurs with apps installed via Google Play or other sources, if they Your proxy\'s port number (e.g. 8118) Privacy - Prevent Screenshots + Prevent screenshots Blocks screenshots from being taken and hides app content from recent apps screen Panic Button App @@ -253,7 +255,7 @@ This often occurs with apps installed via Google Play or other sources, if they Are you sure that you want to allow %1$s to trigger destructive panic button actions? Allow - Panic Button Settings + Panic button settings Actions to be taken in case of emergency Exit App App will be closed @@ -497,13 +499,13 @@ This often occurs with apps installed via Google Play or other sources, if they Installing… Uninstalling… - Never - Hourly - Every 4 hours - Every 12 hours - Daily - Weekly - Every 2 weeks + No automatic app updates + Check for updates hourly + Check for updates every 4 hours + Check for updates every 12 hours + Check for updates daily + Check for updates weekly + Check for updates every 2 weeks 1 Hour 1 Day diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 04ed6ef7b..c883929da 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -23,7 +23,7 @@ #ffffff #a6a6a6 @drawable/ic_warning_white_24dp - @style/PreferenceThemeOverlay + @style/PreferenceThemeOverlay.v14.Material