Move SettingsHelper to outer package

renyuneyun · Feb 20, 2018 · 179fc32 · 179fc32
1 parent 01cc52c
commit 179fc32
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/java/ryey/easer/EaserApplication.java b/app/src/main/java/ryey/easer/EaserApplication.java
@@ -17,8 +17,7 @@ public void onCreate() {
 
         Logger.addLogAdapter(new AndroidLogAdapter());
 
-        if (PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).
-                getBoolean(getString(R.string.key_pref_logging), false)) {
+        if (SettingsHelper.logging(this)) {
             if (ContextCompat.checkSelfPermission(getApplicationContext(),
                     Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
                 Logger.addLogAdapter(new DiskLogAdapter());

diff --git a/.../java/ryey/easer/core/SettingsHelper.java → .../main/java/ryey/easer/SettingsHelper.java b/.../java/ryey/easer/core/SettingsHelper.java → .../main/java/ryey/easer/SettingsHelper.java
@@ -1,4 +1,4 @@
-package ryey.easer.core;
+package ryey.easer;
 
 import android.content.Context;
 import android.preference.PreferenceManager;
@@ -18,4 +18,9 @@ public static boolean passiveMode(Context context) {
                 .getBoolean(context.getString(R.string.key_pref_passive_mode), true);
     }
 
+    public static boolean logging(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).
+                getBoolean(context.getString(R.string.key_pref_logging), false);
+    }
+
 }
diff --git a/app/src/main/java/ryey/easer/core/EHService.java b/app/src/main/java/ryey/easer/core/EHService.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import ryey.easer.SettingsHelper;
 import ryey.easer.core.data.EventTree;
 import ryey.easer.core.data.storage.EventDataStorage;
 

diff --git a/app/src/main/java/ryey/easer/core/Lotus.java b/app/src/main/java/ryey/easer/core/Lotus.java
@@ -35,6 +35,7 @@
 import java.util.Locale;
 import java.util.concurrent.ExecutorService;
 
+import ryey.easer.SettingsHelper;
 import ryey.easer.commons.plugindef.eventplugin.AbstractSlot;
 import ryey.easer.commons.plugindef.eventplugin.EventData;
 import ryey.easer.commons.plugindef.eventplugin.EventPlugin;