Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-27 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

implement test for presence of external storage; don't crash if not present.

Browse source
This commit is contained in:
Andy2 2011-05-02 07:39:07 -07:00
parent 5886f0ed85
commit 7cf412dd50
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsActivity.java
View file

@ -128,7 +128,7 @@ public class DictsActivity extends XWListActivity
public void onClick( View v )
{
if ( GameUtils.haveWriteableSD( this ) ) {
if ( GameUtils.haveWriteableSD() ) {
showDialog( PICK_STORAGE );
} else {
startDownload( false );

39
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -420,9 +420,12 @@ public class GameUtils {
}
}
for ( String file : getSDDir( context ).list() ) {
if ( isDict( file ) ) {
al.add( removeDictExtn( file ) );
File sdDir = getSDDir( context );
if ( null != sdDir ) {
for ( String file : sdDir.list() ) {
if ( isDict( file ) ) {
al.add( removeDictExtn( file ) );
}
}
}
@ -805,21 +808,27 @@ public class GameUtils {
}
}
public static boolean haveWriteableSD( Context context )
public static boolean haveWriteableSD()
{
return true; // fixme :-)
String state = Environment.getExternalStorageState();
return state.equals( Environment.MEDIA_MOUNTED );
// want this later? Environment.MEDIA_MOUNTED_READ_ONLY
}
private static File getSDDir( Context context )
{
File result = null;
File storage = Environment.getExternalStorageDirectory();
if ( null != storage ) {
String packdir = String.format( "Android/data/%s/files/",
context.getPackageName() );
result = new File( storage.getPath(), packdir );
if ( !result.exists() ) {
result.mkdirs();
if ( haveWriteableSD() ) {
File storage = Environment.getExternalStorageDirectory();
if ( null != storage ) {
String packdir = String.format( "Android/data/%s/files/",
context.getPackageName() );
result = new File( storage.getPath(), packdir );
if ( !result.exists() ) {
result.mkdirs();
Assert.assertTrue( result.exists() );
}
}
}
return result;
@ -827,8 +836,12 @@ public class GameUtils {
private static File getSDPathFor( Context context, String name )
{
File result = null;
File dir = getSDDir( context );
return new File( dir, name );
if ( dir != null ) {
result = new File( dir, name );
}
return result;
}
}