Apple-2-Tools/kegs-android
1
0
Fork 0
mirror of https://github.com/jamessanford/kegs.git synced 2025-01-07 22:32:56 +00:00
Code Issues Projects Releases Wiki Activity

Prepare for disk image selector.

Browse Source
This commit is contained in:
James Sanford 2012-12-20 13:17:16 -08:00
parent 611ed0eefc
commit a0e3306ee3
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/froop/app/kegs/ConfigFile.java
View File

@ -1,6 +1,7 @@
package com.froop.app.kegs; package com.froop.app.kegs;
import android.content.Context; import android.content.Context;
import android.os.Environment;
import android.util.Log; import android.util.Log;
import java.io.File; import java.io.File;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
@ -39,6 +40,17 @@ class ConfigFile {
return mContext.getExternalCacheDir().getPath(); return mContext.getExternalCacheDir().getPath();
} }
public String[] getAllImageDirs() {
String externalStorage = Environment.getExternalStorageDirectory().getPath();
String[] dirs = {
getImagePath(),
externalStorage,
externalStorage + "/kegs",
externalStorage + "/Download"
};
return dirs;
}
public void ensureAssetCopied(String destPath, String zipfile, String exampleFile) { public void ensureAssetCopied(String destPath, String zipfile, String exampleFile) {
// We only check for a local copy of a single file before unzipping... // We only check for a local copy of a single file before unzipping...
final File local_copy = new File(destPath, exampleFile); final File local_copy = new File(destPath, exampleFile);

5
src/com/froop/app/kegs/KegsMain.java
View File

@ -265,8 +265,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
public void run() { public void run() {
withUIActive(new Runnable() { withUIActive(new Runnable() {
public void run() { public void run() {
new DiskImageFragment().show(getSupportFragmentManager(), new DiskImageFragment(mConfigFile).show(getSupportFragmentManager(), FRAGMENT_DISKIMAGE);
FRAGMENT_DISKIMAGE);
} }
}); });
} }
@ -438,7 +437,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
supportInvalidateOptionsMenu(); // update icon supportInvalidateOptionsMenu(); // update icon
return true; return true;
} else if (item_id == R.id.action_diskimage) { } else if (item_id == R.id.action_diskimage) {
new DiskImageFragment().show(getSupportFragmentManager(), FRAGMENT_DISKIMAGE); new DiskImageFragment(mConfigFile).show(getSupportFragmentManager(), FRAGMENT_DISKIMAGE);
return true; return true;
} else if (item_id == R.id.action_more_keys) { } else if (item_id == R.id.action_more_keys) {
final int vis = areControlsVisible() ? View.GONE : View.VISIBLE; final int vis = areControlsVisible() ? View.GONE : View.VISIBLE;

13
src/com/froop/app/kegs/diskimage/DiskImage.java
View File

@ -4,7 +4,10 @@ import android.util.Log;
import java.lang.Integer; import java.lang.Integer;
import java.io.File; import java.io.File;
class DiskImage { class DiskImage implements Comparable {
// NOTE: "this class has a natural ordering that is inconsistent with equals"
// (sorted on the filename excluding path, case insensitive)
// template // template
public static final String BOOT_SLOT_5 = "boot_slot_5"; public static final String BOOT_SLOT_5 = "boot_slot_5";
public static final String BOOT_SLOT_6 = "boot_slot_6"; public static final String BOOT_SLOT_6 = "boot_slot_6";
@ -111,4 +114,12 @@ class DiskImage {
return null; return null;
} }
} }
public int compareTo(Object other) {
if (other instanceof DiskImage) {
return this.getTitle().compareToIgnoreCase(((DiskImage)other).getTitle());
} else {
throw new ClassCastException();
}
}
} }