Commit: 2c7c5e3dce116d3d7e62af25cd8ec5fac68c8095 - android_battery_logger (git)

Commit MetaInfo

• Revision: 2c7c5e3dce116d3d7e62af25cd8ec5fac68c8095 (tree)
• Time: 2014-05-27 04:10:27
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Added AllCsvFileMediaScanService

Change Summary

• modified: simple-battery-logger/simple-battery-logger-app/AndroidManifest.xml
• modified: simple-battery-logger/simple-battery-logger-app/res/values/preferences_key_value.xml
• add: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/BatteryLoggerApplication.java
• add: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/AllCsvFileMediaScanService.java
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/CsvFileMediaScanService.java
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/DeleteOldDataService.java
• modified: simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/util/PreferenceUtils.java

Incremental Difference

--- a/simple-battery-logger/simple-battery-logger-app/AndroidManifest.xml
+++ b/simple-battery-logger/simple-battery-logger-app/AndroidManifest.xml
@@ -2,23 +2,25 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.routine_work.simple_battery_logger"
-	android:versionCode="12"
-	android:versionName="1.2.01rc1"
+	android:versionCode="13"
+	android:versionName="1.2.01"
 >
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="11" />
+	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="19" />
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
 	<application
+		android:name=".BatteryLoggerApplication"
 		android:label="@string/app_name"
 		android:icon="@drawable/ic_launcher_battery_log"
 	>
 
 		<!-- ########## Activity ########## -->
 		<!-- main activity -->
-		<activity android:name=".DashboardActivity"
-				  android:label="@string/app_name"
+		<activity
+			android:name=".DashboardActivity"
+			android:label="@string/app_name"
 		>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
@@ -107,6 +109,11 @@
 		/>
 
 		<service
+			android:name=".service.AllCsvFileMediaScanService"
+			android:label="All CSV File Media Scan Service"
+		/>
+
+		<service
 			android:name=".service.CsvFileMediaScanService"
 			android:label="CSV File Media Scan Service"
 		/>

--- a/simple-battery-logger/simple-battery-logger-app/res/values/preferences_key_value.xml
+++ b/simple-battery-logger/simple-battery-logger-app/res/values/preferences_key_value.xml
@@ -19,6 +19,9 @@
 	<string name="csv_export_directory_key">csv_export_directory</string>
 	<string name="csv_export_directory_default_value">simple-battery-logger</string>
 
+	<string name="csv_media_scan_completed_key">csv_media_scan_completed</string>
+	<bool name="csv_media_scan_completed_default_value">false</bool>
+
 	<string name="csv_dropbox_uploader_key">csv_dropbox_uploader</string>
 
 

--- /dev/null
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/BatteryLoggerApplication.java
@@ -0,0 +1,56 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Masahiko, SAWAI <[e-mail]>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.routine_work.simple_battery_logger;
+
+import android.app.Application;
+import android.content.Intent;
+import org.routine_work.simple_battery_logger.service.AllCsvFileMediaScanService;
+import org.routine_work.simple_battery_logger.util.PreferenceUtils;
+import org.routine_work.util.Log;
+
+/**
+ *
+ * @author Masahiko, SAWAI <[e-mail]>
+ */
+public class BatteryLoggerApplication extends Application
+{
+
+	private static final String LOG_TAG = "simple-battery-logger";
+
+	@Override
+	public void onCreate()
+	{
+		Log.v(LOG_TAG, "Hello");
+		super.onCreate();
+
+		boolean csvMediaScanCompleted = PreferenceUtils.isCsvMediaScanCompleted(this);
+		Log.d(LOG_TAG, "csvMediaScanCompleted => " + csvMediaScanCompleted);
+		if (csvMediaScanCompleted == false)
+		{
+			Intent intent = new Intent(getApplicationContext(), AllCsvFileMediaScanService.class);
+			startService(intent);
+		}
+		Log.v(LOG_TAG, "Bye");
+	}
+}

--- /dev/null
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/AllCsvFileMediaScanService.java
@@ -0,0 +1,90 @@
+/*
+ *  The MIT License
+ *
+ *  Copyright 2014 Masahiko, SAWAI <[e-mail]>.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+package org.routine_work.simple_battery_logger.service;
+
+import android.app.IntentService;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Environment;
+import java.io.File;
+import java.util.Date;
+import org.routine_work.simple_battery_logger.BatteryConstants;
+import org.routine_work.simple_battery_logger.util.CsvFilenameFilter;
+import org.routine_work.simple_battery_logger.util.PreferenceUtils;
+import org.routine_work.util.Log;
+
+/**
+ *
+ * @author sawai
+ */
+public class AllCsvFileMediaScanService extends IntentService
+{
+
+	private static final String LOG_TAG = "simple-battery-logger";
+
+	public AllCsvFileMediaScanService(String name)
+	{
+		super(name);
+	}
+
+	public AllCsvFileMediaScanService()
+	{
+		this("AllCsvFileMediaScanService");
+	}
+
+	@Override
+	protected void onHandleIntent(Intent intent)
+	{
+		Log.i(LOG_TAG, "AllCsvFileMediaScanService : Start at " + new Date());
+
+		Context context = this.getApplicationContext();
+		if (PreferenceUtils.isCsvAutoExportEnabled(context) == false)
+		{
+			String csvExportDirectoryName = PreferenceUtils.getCsvExportDirectoryName(context);
+			File externalStorageDirectory = Environment.getExternalStorageDirectory();
+			File csvExportDirectory = new File(externalStorageDirectory, csvExportDirectoryName);
+			if (csvExportDirectory.exists()
+				&& csvExportDirectory.isDirectory()
+				&& csvExportDirectory.canRead())
+			{
+				File[] csvFiles = csvExportDirectory.listFiles(new CsvFilenameFilter());
+				if (csvFiles != null)
+				{
+					Log.d(LOG_TAG, "AllCsvFileMediaScanService : csvFiles.length => " + csvFiles.length);
+					for (File csvFile : csvFiles)
+					{
+						String csvFilePath = csvFile.getAbsolutePath();
+						Intent startCsvFileMediaScanService = new Intent(context, CsvFileMediaScanService.class);
+						startCsvFileMediaScanService.putExtra(BatteryConstants.EXTRA_CSV_FILE_PATH, csvFilePath);
+						context.startService(startCsvFileMediaScanService);
+					}
+				}
+			}
+
+			PreferenceUtils.putCsvMediaScanCompleted(context, true);
+		}
+
+		Log.i(LOG_TAG, "AllCsvFileMediaScanService : End at " + new Date());
+	}
+}

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/CsvFileMediaScanService.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/CsvFileMediaScanService.java
@@ -29,6 +29,7 @@ import android.content.Intent;
 import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.MediaScannerConnectionClient;
 import android.net.Uri;
+import android.text.TextUtils;
 import java.util.Date;
 import org.routine_work.simple_battery_logger.BatteryConstants;
 import org.routine_work.util.Log;
@@ -40,7 +41,6 @@ import org.routine_work.util.Log;
 public class CsvFileMediaScanService extends IntentService
 {
 
-	public static final String EXTRA_DATE = "date"; // yyyy-MM-dd
 	private static final String LOG_TAG = "simple-battery-logger";
 
 	public CsvFileMediaScanService(String name)
@@ -50,44 +50,40 @@ public class CsvFileMediaScanService extends IntentService
 
 	public CsvFileMediaScanService()
 	{
-		this("StartCsvFileMediaScanService");
+		this("CsvFileMediaScanService");
 	}
 
 	@Override
 	protected void onHandleIntent(Intent intent)
 	{
-		Log.i(LOG_TAG, "StartCsvFileMediaScanService : Start at " + new Date());
-
-		boolean exportCsvFileResult = intent.getBooleanExtra(BatteryConstants.EXTRA_RESULT, true);
-		Log.d(LOG_TAG, "intent.EXTRA_RESULT => " + exportCsvFileResult);
-
-		String dateString = intent.getStringExtra(BatteryConstants.EXTRA_DATE);
-		Log.d(LOG_TAG, "intent.EXTRA_DATE => " + dateString);
+		Log.i(LOG_TAG, "CsvFileMediaScanService : Start at " + new Date());
 
 		String csvFilePath = intent.getStringExtra(BatteryConstants.EXTRA_CSV_FILE_PATH);
 		Log.i(LOG_TAG, "intent.EXTRA_CSV_FILE_PATH => " + csvFilePath);
 
-		// Scan CSV File
-		startCsvFileMediaScan(csvFilePath);
+		if (TextUtils.isEmpty(csvFilePath) == false)
+		{
+			startOneCsvFileMediaScan(csvFilePath);
+		}
 
-		Log.i(LOG_TAG, "StartCsvFileMediaScanService : End at " + new Date());
+		Log.i(LOG_TAG, "CsvFileMediaScanService : End at " + new Date());
 	}
 
-	private void startCsvFileMediaScan(String csvFilePath)
+	private void startOneCsvFileMediaScan(String csvFilePath)
 	{
 		Log.v(LOG_TAG, "Hello");
-		CsvFileMediaScanClient csvFileMediaScanClient = new CsvFileMediaScanClient(csvFilePath);
+		OneCsvFileMediaScanClient csvFileMediaScanClient = new OneCsvFileMediaScanClient(csvFilePath);
 		csvFileMediaScanClient.connectMediaScanner();
 		Log.v(LOG_TAG, "Bye");
 	}
 
-	class CsvFileMediaScanClient implements MediaScannerConnectionClient
+	class OneCsvFileMediaScanClient implements MediaScannerConnectionClient
 	{
 
 		private MediaScannerConnection mediaScannerConnection;
 		private String csvFilePath;
 
-		public CsvFileMediaScanClient(String csvFilePath)
+		public OneCsvFileMediaScanClient(String csvFilePath)
 		{
 			this.csvFilePath = csvFilePath;
 		}

--- a/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/DeleteOldDataService.java
+++ b/simple-battery-logger/simple-battery-logger-app/src/org/routine_work/simple_battery_logger/service/DeleteOldDataService.java
@@ -25,10 +25,8 @@ package org.routine_work.simple_battery_logger.service;
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import java.util.Date;
-import org.routine_work.simple_battery_logger.R;
 import org.routine_work.simple_battery_logger.db.BatteryHistoryDBHelper;
 import org.routine_work.util.Log;
 import org.routine_work.simple_battery_logger.util.PreferenceUtils;

--- 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,6 +38,7 @@ public class PreferenceUtils
 
 	private static final String LOG_TAG = "simple-battery-logger";
 
+
 	public static boolean isLoggingServiceEnabled(Context context)
 	{
 		String preferenceName = context.getPackageName() + "_preferences";
@@ -146,6 +147,11 @@ public class PreferenceUtils
 		return exportedSharedPreferences;
 	}
 
+	/**
+	 * Copy CSV Directory from private SharedPreferences to exported SharedPreferences
+	 * 
+	 * @param context 
+	 */
 	public static void exportCsvExportDirectoryName(Context context)
 	{
 		Log.v(LOG_TAG, "Hello");
@@ -163,4 +169,32 @@ public class PreferenceUtils
 
 		Log.v(LOG_TAG, "Bye");
 	}
+
+	public static boolean isCsvMediaScanCompleted(Context context)
+	{
+		String preferenceName = context.getPackageName() + "_preferences";
+		SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
+		Resources resources = context.getResources();
+
+		String key = resources.getString(R.string.csv_media_scan_completed_key);
+		boolean defaultValue = resources.getBoolean(R.bool.csv_media_scan_completed_default_value);
+		boolean value = sharedPreferences.getBoolean(key, defaultValue);
+
+		Log.v(LOG_TAG, "csvMediaScanCompleted => " + value);
+		return value;
+	}
+
+	public static void putCsvMediaScanCompleted(Context context, boolean value)
+	{
+		Log.v(LOG_TAG, "csvMediaScanCompleted => " + value);
+		String preferenceName = context.getPackageName() + "_preferences";
+		SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
+		Resources resources = context.getResources();
+
+		String key = resources.getString(R.string.csv_media_scan_completed_key);
+		SharedPreferences.Editor editor = sharedPreferences.edit();
+		editor.putBoolean(key, value);
+		editor.commit();
+
+	}
 }