OSDN > Developer > say > Chamber > android_battery_logger > Commit

Simple Battery Logger
Fork

(Original repository, No fork origin)

Commit

Refactored PreferenceUtils.java

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/util/PreferenceUtils.java

+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/util/PreferenceUtils.java

		@@ -38,11 +38,39 @@ public class PreferenceUtils
38	38
39	39	private static final String LOG_TAG = "simple-battery-logger";
40	40
41		-
42		- public static boolean isLoggingServiceEnabled(Context context)
	41	+ /**
	42	+ * Get private SharedPreferences
	43	+ *
	44	+ * @param context
	45	+ * @return
	46	+ */
	47	+ public static SharedPreferences getPrivateSharedPreferences(Context context)
43	48	{
44	49	String preferenceName = context.getPackageName() + "_preferences";
45	50	SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	51	+ return sharedPreferences;
	52	+ }
	53	+
	54	+ /**
	55	+ * Get public SharedPreferences
	56	+ *
	57	+ * This SharedPreferences is referenced by Simple Battery Logger Dropbox
	58	+ * Uploader
	59	+ *
	60	+ * @param context
	61	+ * @return
	62	+ */
	63	+ public static SharedPreferences getExportedSharedPreference(Context context)
	64	+ {
	65	+ String exportedPreferenceName = context.getPackageName() + "_exported_preferences";
	66	+ SharedPreferences exportedSharedPreferences = context.getSharedPreferences(
	67	+ exportedPreferenceName, Context.MODE_WORLD_READABLE);
	68	+ return exportedSharedPreferences;
	69	+ }
	70	+
	71	+ public static boolean isLoggingServiceEnabled(Context context)
	72	+ {
	73	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
46	74	Resources resources = context.getResources();
47	75
48	76	String key = resources.getString(R.string.logging_service_enabled_key);

		@@ -56,8 +84,7 @@ public class PreferenceUtils
56	84	public static void putLoggingServiceEnabled(Context context, boolean enabled)
57	85	{
58	86	Log.v(LOG_TAG, "loggingServiceEnabled => " + enabled);
59		- String preferenceName = context.getPackageName() + "_preferences";
60		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	87	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
61	88	Resources resources = context.getResources();
62	89
63	90	String key = resources.getString(R.string.logging_service_enabled_key);

		@@ -70,8 +97,7 @@ public class PreferenceUtils
70	97	public static boolean isIgnoreVoltageChangeOnly(Context context)
71	98	{
72	99
73		- String preferenceName = context.getPackageName() + "_preferences";
74		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	100	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
75	101	Resources resources = context.getResources();
76	102
77	103	String key = resources.getString(R.string.ignore_voltage_change_only_key);

		@@ -84,8 +110,7 @@ public class PreferenceUtils
84	110
85	111	public static int getDataKeepingPeriod(Context context)
86	112	{
87		- String preferenceName = context.getPackageName() + "_preferences";
88		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	113	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
89	114	Resources resources = context.getResources();
90	115
91	116	String key = resources.getString(R.string.data_keeping_period_key);

		@@ -99,8 +124,7 @@ public class PreferenceUtils
99	124
100	125	public static boolean isCsvAutoExportEnabled(Context context)
101	126	{
102		- String preferenceName = context.getPackageName() + "_preferences";
103		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	127	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
104	128	Resources resources = context.getResources();
105	129
106	130	String key = resources.getString(R.string.csv_auto_export_enabled_key);

		@@ -113,8 +137,7 @@ public class PreferenceUtils
113	137
114	138	public static String getCsvSortOrder(Context context)
115	139	{
116		- String preferenceName = context.getPackageName() + "_preferences";
117		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	140	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
118	141	Resources resources = context.getResources();
119	142
120	143	String key = resources.getString(R.string.csv_sort_order_key);

		@@ -127,8 +150,7 @@ public class PreferenceUtils
127	150
128	151	public static String getCsvExportDirectoryName(Context context)
129	152	{
130		- String preferenceName = context.getPackageName() + "_preferences";
131		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	153	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
132	154	Resources resources = context.getResources();
133	155
134	156	String key = resources.getString(R.string.csv_export_directory_key);

		@@ -139,18 +161,11 @@ public class PreferenceUtils
139	161	return value;
140	162	}
141	163
142		- public static SharedPreferences getExportedSharedPreference(Context context)
143		- {
144		- String exportedPreferenceName = context.getPackageName() + "_exported_preferences";
145		- SharedPreferences exportedSharedPreferences = context.getSharedPreferences(
146		- exportedPreferenceName, Context.MODE_WORLD_READABLE);
147		- return exportedSharedPreferences;
148		- }
149		-
150	164	/**
151		- * Copy CSV Directory from private SharedPreferences to exported SharedPreferences
152		- *
153		- * @param context
	165	+ * Copy CSV Directory from private SharedPreferences to exported
	166	+ * SharedPreferences
	167	+ *
	168	+ * @param context
154	169	*/
155	170	public static void exportCsvExportDirectoryName(Context context)
156	171	{

		@@ -172,8 +187,7 @@ public class PreferenceUtils
172	187
173	188	public static boolean isCsvMediaScanCompleted(Context context)
174	189	{
175		- String preferenceName = context.getPackageName() + "_preferences";
176		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	190	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
177	191	Resources resources = context.getResources();
178	192
179	193	String key = resources.getString(R.string.csv_media_scan_completed_key);

		@@ -187,14 +201,12 @@ public class PreferenceUtils
187	201	public static void putCsvMediaScanCompleted(Context context, boolean value)
188	202	{
189	203	Log.v(LOG_TAG, "csvMediaScanCompleted => " + value);
190		- String preferenceName = context.getPackageName() + "_preferences";
191		- SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
	204	+ SharedPreferences sharedPreferences = getPrivateSharedPreferences(context);
192	205	Resources resources = context.getResources();
193	206
194	207	String key = resources.getString(R.string.csv_media_scan_completed_key);
195	208	SharedPreferences.Editor editor = sharedPreferences.edit();
196	209	editor.putBoolean(key, value);
197	210	editor.commit();
198		-
199	211	}
200	212	}