Commit: f494f2b361899892c9e8e93112a826bb1b8b967b - NaviVoiceChanger (git)

Navigation voice changer app for Android

Commit MetaInfo

• Revision: f494f2b361899892c9e8e93112a826bb1b8b967b (tree)
• Time: 2013-07-30 19:45:45
• Author: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Fix crush without SD, and show warning.

Change Summary

• modified: res/values/strings.xml
• modified: src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
• modified: src/jp/nekoteki/android/navivoicechanger/VoiceData.java

Incremental Difference

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,5 +35,7 @@
     <string name="title_activity_download">DownloadActivity</string>
     <string name="guide_download">Tap to download. Then push back button to move to install view to install.</string>
     <string name="download_progress">Donwloading...</string>
+    <string name="err_no_sd">No external storage is detected. You need to check your SD card or storage setting.</string>
+    <string name="err_no_sd_title">Medium Error</string>
 
 </resources>

--- a/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
@@ -3,7 +3,6 @@ package jp.nekoteki.android.navivoicechanger;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 
 import net.arnx.jsonic.JSON;
@@ -24,10 +23,8 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
-import android.widget.AdapterViewFlipper;
 import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

--- a/src/jp/nekoteki/android/navivoicechanger/VoiceData.java
+++ b/src/jp/nekoteki/android/navivoicechanger/VoiceData.java
@@ -4,7 +4,6 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,6 +20,7 @@ import java.util.zip.ZipException;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.util.Log;
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.res.AssetManager;
 
@@ -69,6 +69,7 @@ public class VoiceData {
 		ArrayList<VoiceData> list = new ArrayList<VoiceData>();
 
 		File vdDir = getBaseDir(context);
+		if (vdDir == null) return list;
 		Log.d(VoiceData.class.getClass().getName(), "Voice Data Dir = "+vdDir.getAbsolutePath());
 		
 		File[] vddlist = vdDir.listFiles();
@@ -94,6 +95,10 @@ public class VoiceData {
   		File baseDir = context.getExternalFilesDir(null);
  		if (baseDir == null) {
  			Log.i("VoiceData", "Can't get external storage path.");
+ 			AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ 			builder.setMessage(R.string.err_no_sd).setTitle(R.string.err_no_sd_title);
+ 			AlertDialog dialog = builder.create();
+ 			dialog.show();
  			return null;
  		}
 		File vdDir = new File(baseDir, "voicedata");