Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed the default location for the sdcard. Instead of using a fixed value of "/sdcard/Wagic/Res" it now uses Environment.getExternalStorageDirectory().getPath() + "/Wagic/Res"

Browse Source
This commit is contained in:
Michael Nguyen
2013-10-28 15:20:11 -07:00
parent 362cc1b4c2
commit 4eb1fd35e0
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/Android/default.properties
View File

@@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-10
target=android-9

2
projects/mtg/Android/project.properties
View File

@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-10
target=android-9

26
projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
View File

@@ -83,11 +83,11 @@ public class SDLActivity extends Activity implements OnKeyListener
private AlertDialog mErrorDialog;
public String mErrorMessage = "";
public Boolean mErrorHappened = false;
public final static String RES_FOLDER = "/sdcard/Wagic/Res/";
public final static String RES_FOLDER = Environment.getExternalStorageDirectory().getPath() + "/Wagic/Res/";
public static String RES_FILENAME = "core_0184.zip";
public static final String RES_URL = "http://wagic.googlecode.com/files/";
public String systemFolder = "/sdcard/Wagic/Res/";
public String systemFolder = Environment.getExternalStorageDirectory().getPath() + "/Wagic/Res/";
private String userFolder;
// path to the onboard sd card that is not removable (typically /mnt/sdcard )
@@ -135,7 +135,10 @@ public class SDLActivity extends Activity implements OnKeyListener
public boolean checkStorageState()
{
SharedPreferences settings = getSharedPreferences(kWagicSharedPreferencesKey, MODE_PRIVATE);
boolean useSdCard = (!settings.getBoolean(kStoreDataOnRemovableSdCardPreference, false)) && Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
boolean mExternalStorageAvailable = false;
boolean mExternalStorageWriteable = false;
String state = Environment.getExternalStorageState();
boolean useSdCard = (!settings.getBoolean(kStoreDataOnRemovableSdCardPreference, false)) && mExternalStorageWriteable;
String systemStoragePath = getSystemStorageLocation();
if (useSdCard && (systemStoragePath.indexOf(sdcardPath) != -1))
@@ -150,7 +153,20 @@ public class SDLActivity extends Activity implements OnKeyListener
return true;
}
return false;
if (Environment.MEDIA_MOUNTED.equals(state)) {
// We can read and write the media
mExternalStorageAvailable = mExternalStorageWriteable = true;
} else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
// We can only read the media
mExternalStorageAvailable = true;
mExternalStorageWriteable = false;
} else {
// Something else is wrong. It may be one of many other states, but all we need
// to know is we can neither read nor write
mExternalStorageAvailable = mExternalStorageWriteable = false;
}
return (mExternalStorageAvailable && mExternalStorageWriteable);
}
private boolean getRemovableMediaStorageState()
@@ -781,7 +797,7 @@ public class SDLActivity extends Activity implements OnKeyListener
Log.e(TAG1, e.getMessage());
}
return new Long(totalBytes);
return Long.valueOf(totalBytes);
}
protected void onProgressUpdate(Integer... progress)