Skip to content

fix sdcard wipe - un-commented the fail-safe wipe #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kolohe wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix sdcard wipe - un-commented the fail-safe wipe #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
401ba2c
fix wipe sdcard , un-commented the fail-safe wipe
kolohe Sep 8, 2012
3495a2a
fix sdCard wipe for 4+ and custom roms
kolohe Sep 8, 2012
b752dc7
who has hidden all the default paths for external sdcards ?
kolohe Sep 8, 2012
08e609e
check that sdcard is not empty to verify mounted
kolohe Sep 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/android/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
11 changes: 0 additions & 11 deletions projects/android/default.properties
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions projects/android/src/org/safermobile/intheclear/ITCConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ public static class CALENDAR {
"sync_events"
};
}

}

public static class Duriation {
Expand Down
9 changes: 9 additions & 0 deletions projects/android/src/org/safermobile/intheclear/Wizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions projects/android/src/org/safermobile/intheclear/data/PIMWiper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
*/

}
}
16 changes: 15 additions & 1 deletion projects/android/src/org/safermobile/utils/FolderIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,23 @@ public class FolderIterator {
private static SharedPreferences _sp;

public FolderIterator() {
pathToSDCard = Environment.getExternalStorageDirectory();
File external_sd =new File("/mnt/sdcard/external_sd/");
File extSdCard = new File("/mnt/extSdCard/");
File emmc = new File("/mnt/emmc/");

if(external_sd.exists() && external_sd.list().length>0) {
pathToSDCard = external_sd;
}else if (extSdCard.exists() && extSdCard.list().length>0){
pathToSDCard = extSdCard;
}else if (emmc.exists() && emmc.list().length>0){
pathToSDCard = emmc;
}else{
pathToSDCard = Environment.getExternalStorageDirectory();
}
}



public static ArrayList<File> getFoldersOnSDCard() {
File[] folder = pathToSDCard.listFiles();
ArrayList<File> folders = new ArrayList<File>();
Expand Down