diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml index 3f279f80b..eaa57ae32 100644 --- a/AndorsTrail/AndroidManifest.xml +++ b/AndorsTrail/AndroidManifest.xml @@ -3,8 +3,8 @@ diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java index 4a6a5ac6a..97912323e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java @@ -7,7 +7,7 @@ import java.util.Locale; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.Constants; -import com.gpl.rpg.AndorsTrail.savegames.Savegames; +import com.gpl.rpg.AndorsTrail.util.AndroidStorage; import com.gpl.rpg.AndorsTrail.util.Pair; import android.app.Activity; @@ -118,7 +118,7 @@ public final class AndorsTrailApplication extends Application { super.onCreate(); if ( DEVELOPMENT_DEBUGMESSAGES && isExternalStorageWritable() ) { - File appDirectory = Savegames.getStorageDirectory(getApplicationContext(), Constants.FILENAME_SAVEGAME_DIRECTORY); + File appDirectory = AndroidStorage.getStorageDirectory(getApplicationContext(), Constants.FILENAME_SAVEGAME_DIRECTORY); File logDirectory = new File( appDirectory, "log" ); File logFile = new File( logDirectory, "logcat" + System.currentTimeMillis() + ".txt" ); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java index 94518f213..967d0d96d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java @@ -203,7 +203,7 @@ public class StartScreenActivity_MainMenu extends Fragment { public void migrateDataOnDemand(final Activity activity) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { - if (AndroidStorage.ShouldMigrateToInternalStorage(activity.getApplicationContext())) { + if (AndroidStorage.shouldMigrateToInternalStorage(activity.getApplicationContext())) { final Dialog d = CustomDialogFactory.createDialog(activity, getString(R.string.startscreen_migration_title), activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert), @@ -219,7 +219,7 @@ public class StartScreenActivity_MainMenu extends Fragment { } }); CustomDialogFactory.show(d); - if (!AndroidStorage.MigrateToInternalStorage(activity.getApplicationContext())) { + if (!AndroidStorage.migrateToInternalStorage(activity.getApplicationContext())) { final Dialog errorDlg = CustomDialogFactory.createDialog(activity, getString(R.string.startscreen_migration_title), activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert), diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java index 705c3b718..66a58cdba 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java @@ -29,7 +29,6 @@ import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment; import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea; import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap; import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection; -import com.gpl.rpg.AndorsTrail.savegames.Savegames; import com.gpl.rpg.AndorsTrail.util.AndroidStorage; import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.CoordRect; @@ -152,7 +151,7 @@ public final class WorldMapController { } private static void ensureWorldmapDirectoryExists(Context context) throws IOException { - File dir = AndroidStorage.GetStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); + File dir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); if (!dir.exists()) dir.mkdir(); dir = new File(dir, Constants.FILENAME_WORLDMAP_DIRECTORY); if (!dir.exists()) dir.mkdir(); @@ -178,7 +177,7 @@ public final class WorldMapController { return new File(getWorldmapDirectory(context), fileName + ".png"); } private static File getWorldmapDirectory(Context context) { - File dir = AndroidStorage.GetStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); + File dir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); return new File(dir, Constants.FILENAME_WORLDMAP_DIRECTORY); } public static File getCombinedWorldMapFile(Context context, String segmentName) { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java index 6e45fb62c..ade6f155f 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java @@ -85,7 +85,7 @@ public final class Savegames { } private static void writeBackup(Context androidContext, byte[] savegame, String playerId) throws IOException { - File cheatDetectionFolder = AndroidStorage.GetStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER); + File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER); if (!cheatDetectionFolder.exists()) cheatDetectionFolder.mkdir(); File backupFile = new File(cheatDetectionFolder, playerId + "X"); FileOutputStream fileOutputStream = new FileOutputStream(backupFile); @@ -129,7 +129,7 @@ public final class Savegames { private static boolean triedToCheat(Context androidContext, FileHeader fh) throws IOException { long savedVersionToCheck = 0; - File cheatDetectionFolder = AndroidStorage.GetStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER); + File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER); if (!cheatDetectionFolder.exists()) cheatDetectionFolder.mkdir(); File cheatDetectionFile = new File(cheatDetectionFolder, fh.playerId); if (cheatDetectionFile.exists()) { @@ -176,7 +176,7 @@ public final class Savegames { } } private static void ensureSavegameDirectoryExists(Context context) { - File dir = AndroidStorage.GetStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); + File dir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); if (!dir.exists()) dir.mkdir(); } private static FileInputStream getInputFile(Context androidContext, int slot) throws IOException { @@ -188,7 +188,7 @@ public final class Savegames { } public static File getSlotFile(int slot, Context context) { - File root = AndroidStorage.GetStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); + File root = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); return new File(root, Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + slot); } @@ -250,7 +250,7 @@ public final class Savegames { } private static void writeCheatCheck(Context androidContext, long savedVersion, String playerId) throws IOException { - File cheatDetectionFolder = AndroidStorage.GetStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER); + File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER); if (!cheatDetectionFolder.exists()) cheatDetectionFolder.mkdir(); File cheatDetectionFile = new File(cheatDetectionFolder, playerId); FileOutputStream fileOutputStream = new FileOutputStream(cheatDetectionFile); @@ -271,7 +271,7 @@ public final class Savegames { public static List getUsedSavegameSlots(Context context) { try { final List result = new ArrayList(); - AndroidStorage.GetStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY).listFiles(new FilenameFilter() { + AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY).listFiles(new FilenameFilter() { @Override public boolean accept(File f, String filename) { Matcher m = savegameFilenamePattern.matcher(filename); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java index 36fb8a756..409023c60 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java @@ -16,7 +16,7 @@ import java.io.InputStream; import java.io.OutputStream; public final class AndroidStorage { - public static File GetStorageDirectory(Context context, String name) { + public static File getStorageDirectory(Context context, String name) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { return context.getExternalFilesDir(name); } @@ -25,29 +25,29 @@ public final class AndroidStorage { return new File(root, name); } } - public static boolean ShouldMigrateToInternalStorage(Context context) { + public static boolean shouldMigrateToInternalStorage(Context context) { boolean ret = false; File externalSaveGameDirectory = new File(Environment.getExternalStorageDirectory(), Constants.FILENAME_SAVEGAME_DIRECTORY); - File internalSaveGameDirectory = GetStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); + File internalSaveGameDirectory = getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY); if (externalSaveGameDirectory.exists() && externalSaveGameDirectory.isDirectory() && externalSaveGameDirectory.listFiles().length > 0 && ( !internalSaveGameDirectory.exists() - || internalSaveGameDirectory.isDirectory() && internalSaveGameDirectory.listFiles().length == 0) + || internalSaveGameDirectory.isDirectory() && internalSaveGameDirectory.listFiles().length < 2) ) { ret = true; } return ret; } - public static boolean MigrateToInternalStorage(Context context) { + public static boolean migrateToInternalStorage(Context context) { try { copy(new File(Environment.getExternalStorageDirectory(), Constants.CHEAT_DETECTION_FOLDER), - GetStorageDirectory(context, Constants.CHEAT_DETECTION_FOLDER)); + getStorageDirectory(context, Constants.CHEAT_DETECTION_FOLDER)); copy(new File(Environment.getExternalStorageDirectory(), Constants.FILENAME_SAVEGAME_DIRECTORY), - GetStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY)); + getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY)); } catch (IOException e) { L.log("Error migrating data: " + e.toString()); return false;