From a5d642911df1b9a7221011527b528eda44d90304 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 13 Jun 2018 12:10:42 +0200 Subject: [PATCH] move all main preference handling to Preferences class --- .../main/java/org/fdroid/fdroid/CompatibilityChecker.java | 5 +---- app/src/main/java/org/fdroid/fdroid/Preferences.java | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java index 576431f6e..d8d81fffc 100644 --- a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java +++ b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java @@ -1,12 +1,10 @@ package org.fdroid.fdroid; import android.content.Context; -import android.content.SharedPreferences; import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Build; import android.support.annotation.Nullable; -import android.support.v7.preference.PreferenceManager; import org.fdroid.fdroid.compat.SupportedArchitectures; import org.fdroid.fdroid.data.Apk; @@ -31,8 +29,7 @@ public class CompatibilityChecker { context = ctx.getApplicationContext(); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx); - forceTouchApps = prefs.getBoolean(Preferences.PREF_FORCE_TOUCH_APPS, false); + forceTouchApps = Preferences.get().forceTouchApps(); PackageManager pm = ctx.getPackageManager(); diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index 65bc50821..d30fe7b21 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -345,6 +345,10 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh preferences.edit().putBoolean(PREF_EXPERT, flag).apply(); } + public boolean forceTouchApps() { + return preferences.getBoolean(Preferences.PREF_FORCE_TOUCH_APPS, false); + } + public Theme getTheme() { return Theme.valueOf(preferences.getString(Preferences.PREF_THEME, Preferences.DEFAULT_THEME)); }