From 401ba2c791a505fb1faad60df13aab375e32b1ea Mon Sep 17 00:00:00 2001 From: kolohe Date: Fri, 7 Sep 2012 21:55:56 -0400 Subject: [PATCH 1/4] fix wipe sdcard , un-commented the fail-safe wipe --- projects/android/.classpath | 3 ++- projects/android/default.properties | 11 ----------- .../src/org/safermobile/intheclear/ITCConstants.java | 2 ++ .../src/org/safermobile/intheclear/Wizard.java | 9 +++++++++ .../src/org/safermobile/intheclear/data/PIMWiper.java | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 projects/android/default.properties diff --git a/projects/android/.classpath b/projects/android/.classpath index 6efcbb7..4160c21 100644 --- a/projects/android/.classpath +++ b/projects/android/.classpath @@ -3,5 +3,6 @@ - + + diff --git a/projects/android/default.properties b/projects/android/default.properties deleted file mode 100644 index e2e8061..0000000 --- a/projects/android/default.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-8 diff --git a/projects/android/src/org/safermobile/intheclear/ITCConstants.java b/projects/android/src/org/safermobile/intheclear/ITCConstants.java index 7eedb16..c2ef688 100644 --- a/projects/android/src/org/safermobile/intheclear/ITCConstants.java +++ b/projects/android/src/org/safermobile/intheclear/ITCConstants.java @@ -1,6 +1,7 @@ package org.safermobile.intheclear; import android.app.Activity; +import android.os.Environment; import android.provider.CallLog; import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Phone; @@ -165,6 +166,7 @@ public static class CALENDAR { "sync_events" }; } + } public static class Duriation { diff --git a/projects/android/src/org/safermobile/intheclear/Wizard.java b/projects/android/src/org/safermobile/intheclear/Wizard.java index a41b115..7130dc3 100644 --- a/projects/android/src/org/safermobile/intheclear/Wizard.java +++ b/projects/android/src/org/safermobile/intheclear/Wizard.java @@ -345,7 +345,16 @@ public WizardForm(Context c, int wNum, int[] screen) { break; case 2: + + // TODO + // for avd testing allow skipping this screen + + wizardForward.setEnabled(false); + // wizardForward.setEnabled(true); + + + LinearLayout ynHolder = new LinearLayout(c); ynHolder.setLayoutParams(lp); ynHolder.setOrientation(LinearLayout.HORIZONTAL); diff --git a/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java b/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java index 3b148b0..0cfba7f 100644 --- a/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java +++ b/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java @@ -437,10 +437,10 @@ else if(file.isDirectory() && file.canRead()) // remove this folder (if it's not the SDCard, naturally) // if, for some reason, the folder was not fully emptied, // this will fail. so do it again. - /* + if(folder.getPath().compareTo(FolderIterator.pathToSDCard.toString()) != 0) if(!folder.delete()) wipeFolder(folder); - */ + } } \ No newline at end of file From 3495a2af787e97393e02f0b7adbc9d8123b87fa7 Mon Sep 17 00:00:00 2001 From: kolohe Date: Sat, 8 Sep 2012 15:23:20 -0400 Subject: [PATCH 2/4] fix sdCard wipe for 4+ and custom roms --- .../org/safermobile/intheclear/ITCConstants.java | 1 - .../src/org/safermobile/utils/FolderIterator.java | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/projects/android/src/org/safermobile/intheclear/ITCConstants.java b/projects/android/src/org/safermobile/intheclear/ITCConstants.java index c2ef688..edebc82 100644 --- a/projects/android/src/org/safermobile/intheclear/ITCConstants.java +++ b/projects/android/src/org/safermobile/intheclear/ITCConstants.java @@ -1,7 +1,6 @@ package org.safermobile.intheclear; import android.app.Activity; -import android.os.Environment; import android.provider.CallLog; import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Phone; diff --git a/projects/android/src/org/safermobile/utils/FolderIterator.java b/projects/android/src/org/safermobile/utils/FolderIterator.java index b926992..3b6d2b4 100644 --- a/projects/android/src/org/safermobile/utils/FolderIterator.java +++ b/projects/android/src/org/safermobile/utils/FolderIterator.java @@ -18,7 +18,19 @@ public class FolderIterator { private static SharedPreferences _sp; public FolderIterator() { - pathToSDCard = Environment.getExternalStorageDirectory(); + File external_sd =new File("/mnt/external_sd/"); + File extSdCard = new File("/mnt/extSdCard/"); + File emmc = new File("/mnt/emmc/"); + + if(external_sd.exists()) { + pathToSDCard = external_sd; + }else if (extSdCard.exists()){ + pathToSDCard = extSdCard; + }else if (emmc.exists()){ + pathToSDCard = emmc; + }else{ + pathToSDCard = Environment.getExternalStorageDirectory(); + } } public static ArrayList getFoldersOnSDCard() { From b752dc76c5c4abdc212c97aa8342c2d19dd4c321 Mon Sep 17 00:00:00 2001 From: kolohe Date: Sat, 8 Sep 2012 15:49:07 -0400 Subject: [PATCH 3/4] who has hidden all the default paths for external sdcards ? --- projects/android/src/org/safermobile/utils/FolderIterator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/android/src/org/safermobile/utils/FolderIterator.java b/projects/android/src/org/safermobile/utils/FolderIterator.java index 3b6d2b4..76252c6 100644 --- a/projects/android/src/org/safermobile/utils/FolderIterator.java +++ b/projects/android/src/org/safermobile/utils/FolderIterator.java @@ -18,7 +18,7 @@ public class FolderIterator { private static SharedPreferences _sp; public FolderIterator() { - File external_sd =new File("/mnt/external_sd/"); + File external_sd =new File("/mnt/sdcard/external_sd/"); File extSdCard = new File("/mnt/extSdCard/"); File emmc = new File("/mnt/emmc/"); From 08e609e8b1eb0f1fc4f1e5a652e52f2ac1920410 Mon Sep 17 00:00:00 2001 From: kolohe Date: Sat, 8 Sep 2012 17:25:06 -0400 Subject: [PATCH 4/4] check that sdcard is not empty to verify mounted --- .../android/src/org/safermobile/utils/FolderIterator.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/android/src/org/safermobile/utils/FolderIterator.java b/projects/android/src/org/safermobile/utils/FolderIterator.java index 76252c6..f74118e 100644 --- a/projects/android/src/org/safermobile/utils/FolderIterator.java +++ b/projects/android/src/org/safermobile/utils/FolderIterator.java @@ -22,17 +22,19 @@ public FolderIterator() { File extSdCard = new File("/mnt/extSdCard/"); File emmc = new File("/mnt/emmc/"); - if(external_sd.exists()) { + if(external_sd.exists() && external_sd.list().length>0) { pathToSDCard = external_sd; - }else if (extSdCard.exists()){ + }else if (extSdCard.exists() && extSdCard.list().length>0){ pathToSDCard = extSdCard; - }else if (emmc.exists()){ + }else if (emmc.exists() && emmc.list().length>0){ pathToSDCard = emmc; }else{ pathToSDCard = Environment.getExternalStorageDirectory(); } } + + public static ArrayList getFoldersOnSDCard() { File[] folder = pathToSDCard.listFiles(); ArrayList folders = new ArrayList();