Import Export

.githooks/git-hooks-config.bat

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# This script will config git hook path into specific folder in your project. This script will invoked by maven build.
-# @author : Mak Sophea
-# @version : 1.0#
-#
-echo "config git hooksPath to .githooks folder for commit-msg and pre-push"
-git config core.hooksPath .githooks

.githooks/git-hooks-config.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# This script will config git hook path into specific folder in your project. This script will invoked by maven build.
-# @author : Mak Sophea
-# @version : 1.0#
-#
-echo "config git hooksPath to .githooks folder for commit-msg and pre-push"
-git config core.hooksPath .githooks

.githooks/pre-push

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# @author: OMGeeky
-# @created: 2023-10-15
-# @description: A script to check if a tileset is duplicated in a Tiled map.
-
-echo "Checking for duplicate tilesets..."
-
-# The folder to scan
-folder="AndorsTrail/res/xml/*.tmx"
-# The regex pattern to look for
-regex='(?s)(map_\w*").*\1'
-found=0
-# Iterate over the files in the folder
-for file in $folder; do
-    # If the file matches the regex pattern, print a warning and exit with a nonzero status
-#    echo "Checking file $file"
-    if grep -Pzq "$regex" "$file"; then
-        echo "Warning: File $file contains the regex pattern!"
-        found=$((found + 1))
-        # Print each location where the pattern is found
-        grep -Pzao  '(?s)(map_\w*").*\1' "$file" | awk -F "\"" '{print $1; exit}'
-        echo ""
-    fi
-done
-if [ $found -gt 0 ]; then
-  echo "Duplicate tilesets found in $found files."
-    exit 1
-else
-  echo "No duplicate tilesets found."
-fi
-
-# If no files matched the regex pattern, exit with a zero status
-exit 0

AndorsTrail/.gitignore

@@ -1,3 +1,6 @@
+# Android ignores
+app/src/main/res
+app/src/main/assets
 gen/
 bin/
 target/
@@ -37,6 +40,9 @@ gradle-app.setting
 # Cache of project
 .gradletasknamecache
 
+
+local.properties
+
 # Eclipse Gradle plugin generated files
 # Eclipse Core
 .project

AndorsTrail/app/build.gradle

@@ -1,76 +1,23 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
-        targetSdkVersion 34
+        targetSdkVersion 30
     }
 
     buildTypes {
         release {
-            manifestPlaceholders icon_name: 'icon', fileproviderPath: 'AndorsTrail'
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
-        debug {
-            manifestPlaceholders icon_name: 'icon_beta', fileproviderPath: 'AndorsTrail.beta2'
-            applicationIdSuffix 'beta2'
-        }
-    }
-    namespace 'com.gpl.rpg.AndorsTrail'
-    
-    sourceSets {
-        main {
-            res.srcDirs = ['build/gen-res', 'src/main/res']
-            assets.srcDirs = ['build/gen-assets', 'src/main/assets']
-        }
     }
 }
 
 dependencies {
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-}
-
-task copyRes(type: Copy) {
-    description "Copies the res folder to the modules res folder (& renames .tmx to .xml)"
-    from "${rootDir}/res"
-    into "${projectDir}/build/gen-res"
-    rename "(.*)\\.tmx", "\$1.xml"
-}
-
-task copyResValuesIn(type: Copy) {
-    description "Exception Indonesian language code (Old IN was renamed to now ID)"
-    from "${rootDir}/res/values-id/"
-    into "${projectDir}/build/gen-res/values-in/"
-}
-
-task copyTranslation(type: Copy) {
-    description("Copies the translation files to the modules translations folder")
-    from "${rootDir}/assets/translation"
-    into "${projectDir}/build/gen-assets/translation"
-}
-
-task cleanup(type: Delete) {
-    description("Deletes the assets/translation and the res folder from the modules folder")
-    delete "${projectDir}/build/gen-res", "${projectDir}/build/gen-assets/translation"
-}
-
-afterEvaluate {
-    project.tasks.copyRes.dependsOn project.tasks.copyResValuesIn
-
-    mergeDebugResources.dependsOn project.tasks.copyRes
-    extractDeepLinksDebug.dependsOn project.tasks.copyRes
-    mergeReleaseResources.dependsOn project.tasks.copyRes
-    extractDeepLinksRelease.dependsOn project.tasks.copyRes
-
-    mergeDebugAssets.dependsOn project.tasks.copyTranslation
-    mergeReleaseAssets.dependsOn project.tasks.copyTranslation
-    extractDeepLinksDebug.dependsOn project.tasks.copyTranslation
-    extractDeepLinksRelease.dependsOn project.tasks.copyTranslation
-
-    clean.dependsOn project.tasks.cleanup
+    implementation 'com.android.support:support-v4:28.0.0'
 }

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -3,11 +3,12 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="74"
-	android:versionName="0.8.8dev"
+	android:versionCode="66"
+	android:versionName="0.8.2"
 	android:installLocation="auto"
 	>
 
+	
 	<supports-screens
 		android:smallScreens="true" 
 		android:normalScreens="true"
@@ -23,7 +24,7 @@
 	<application 
 		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
 		android:label="@string/app_name" 
-		android:icon="@drawable/${icon_name}"
+		android:icon="@drawable/icon"
 		android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AndorsTrailTheme_Blue"
@@ -31,11 +32,10 @@
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
 		>
-		<activity
-			android:exported="true"
+		<activity 
 		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
 		    android:clearTaskOnLaunch="true"
-		    >
+			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -43,7 +43,6 @@
 		</activity>
    		<activity 
 			android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
-			android:label="@string/app_name" 
 			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
 		<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />
@@ -63,8 +62,8 @@
 		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
 
         <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="${applicationId}.fileprovider"
+        android:name="android.support.v4.content.FileProvider"
+        android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">
         <meta-data

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

@@ -24,15 +24,15 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.8dev";
+	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.2";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 74;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 66;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java

@@ -78,7 +78,7 @@ public final class AndorsTrailPreferences {
 			dest.dpadTransparency = Integer.parseInt(prefs.getString("dpadtransparency", Integer.toString(DPAD_TRANSPARENCY_50_PERCENT)));
 			dest.dpadMinimizeable = prefs.getBoolean("dpadMinimizeable", true);
 			dest.optimizedDrawing = prefs.getBoolean("optimized_drawing", false);
-			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", false);
+			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", true);
 			dest.enableUiAnimations = prefs.getBoolean("enableUiAnimations", true);
 			dest.displayOverwriteSavegame = Integer.parseInt(prefs.getString("display_overwrite_savegame", Integer.toString(CONFIRM_OVERWRITE_SAVEGAME_ALWAYS)));
 			dest.quickslotsPosition = Integer.parseInt(prefs.getString("quickslots_placement", Integer.toString(QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM)));

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java

@@ -15,7 +15,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -46,15 +46,14 @@ import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 
 public final class Dialogs {
 
-	private static void showDialogAndPause(CustomDialog d, final ControllerContext context) {
+	private static void showDialogAndPause(Dialog d, final ControllerContext context) {
 		showDialogAndPause(d, context, null);
 	}
-	private static void showDialogAndPause(CustomDialog d, final ControllerContext context, final OnDismissListener onDismiss) {
+	private static void showDialogAndPause(Dialog d, final ControllerContext context, final OnDismissListener onDismiss) {
 		context.gameRoundController.pause();
 		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
 			@Override
@@ -196,7 +195,7 @@ public final class Dialogs {
 		//		itemList.setPadding(20, 0, 20, 20);
 		itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
 
-		final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
+		final Dialog d = CustomDialogFactory.createDialog(mainActivity, 
 				mainActivity.getResources().getString(title), 
 				mainActivity.getResources().getDrawable(R.drawable.ui_icon_equipment), 
 				msg, 
@@ -250,7 +249,7 @@ public final class Dialogs {
 	}
 
 	public static void showHeroDied(final MainActivity mainActivity, final ControllerContext controllers) {
-		final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
+		final Dialog d = CustomDialogFactory.createDialog(mainActivity,
 				mainActivity.getResources().getString(R.string.dialog_game_over_title),
 				mainActivity.getResources().getDrawable(R.drawable.ui_icon_combat),
 				mainActivity.getResources().getString(R.string.dialog_game_over_text),
@@ -287,7 +286,7 @@ public final class Dialogs {
 	}
 
 	public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
-		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
 				currentActivity.getResources().getString(R.string.dialog_rest_title), 
 				null, 
 				currentActivity.getResources().getString(R.string.dialog_rest_confirm_message), 
@@ -311,7 +310,7 @@ public final class Dialogs {
 		//		.setMessage(R.string.dialog_rest_message)
 		//		.setNeutralButton(android.R.string.ok, null)
 		//		.create();
-		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
 				currentActivity.getResources().getString(R.string.dialog_rest_title), 
 				null, 
 				currentActivity.getResources().getString(R.string.dialog_rest_message), 
@@ -337,7 +336,7 @@ public final class Dialogs {
 			text += currentActivity.getResources().getString(R.string.dialog_newversion_permission_information);
 		}
 
-		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
 				currentActivity.getResources().getString(R.string.dialog_newversion_title), 
 				null, 
 				text,
@@ -372,7 +371,7 @@ public final class Dialogs {
 		}
 
 		if (!world.model.statistics.hasUnlimitedSaves()) {
-			final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
+			final Dialog d = CustomDialogFactory.createDialog(mainActivity,
 					mainActivity.getResources().getString(R.string.menu_save_switch_character_title),
 					null,
 					mainActivity.getResources().getString(R.string.menu_save_switch_character),
@@ -461,7 +460,7 @@ public final class Dialogs {
 		itemList.setAdapter(new ArrayAdapter<String>(context, R.layout.combatlog_row, android.R.id.text1, combatLogMessages));
 		view = itemList;
 
-		final CustomDialog d = CustomDialogFactory.createDialog(context,
+		final Dialog d = CustomDialogFactory.createDialog(context, 
 				context.getResources().getString(R.string.combat_log_title), 
 				context.getResources().getDrawable(R.drawable.ui_icon_combat), 
 				null, 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java

@@ -1,7 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
-import androidx.fragment.app.FragmentActivity;
+import android.support.v4.app.FragmentActivity;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java

@@ -23,7 +23,6 @@ import com.gpl.rpg.AndorsTrail.controller.ItemController;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 /**
  * @author ejwessel
@@ -207,7 +206,7 @@ public final class BulkSelectionInterface extends AndorsTrailBaseActivity implem
 //									})
 //						.setNegativeButton(android.R.string.no, null)
 //						.show();
-					final CustomDialog d = CustomDialogFactory.createDialog(v.getContext(),
+					final Dialog d = CustomDialogFactory.createDialog(v.getContext(),
 							v.getContext().getResources().getString(R.string.bulkselection_sell_confirmation_title),
 							v.getContext().getResources().getDrawable(android.R.drawable.ic_dialog_info),
 							message,

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java

@@ -277,13 +277,6 @@ public final class DebugInterface {
 				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard2", "south", 0, 0);
 			}
 		})
-				,new DebugButton("gal", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_19", "south", 0, 0);
-			}
-		})
-
 		}));
 		buttonList.addAll(tpButtons2);
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java

@@ -2,7 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentTabHost;
+import android.support.v4.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java

@@ -1,17 +1,16 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import java.io.DataInputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
 import android.Manifest;
+import android.annotation.TargetApi;
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.ClipData;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -20,8 +19,8 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.RequiresApi;
-import androidx.documentfile.provider.DocumentFile;
+import android.support.annotation.RequiresApi;
+import android.support.v4.provider.DocumentFile;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -41,7 +40,6 @@ import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
 import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
     private boolean isLoading = true;
@@ -117,11 +115,6 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
                 importSaves.setOnClickListener(this);
                 importWorldmap.setOnClickListener(this);
                 exportImportContainer.setVisibility(View.VISIBLE);
-
-                boolean hasSavegames = !Savegames.getUsedSavegameSlots(this).isEmpty();
-                exportSaves.setEnabled(hasSavegames);
-            } else {
-                exportImportContainer.setVisibility(View.GONE);
             }
         }
     }
@@ -130,17 +123,12 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     private static final int WRITE_EXTERNAL_STORAGE_REQUEST = 2;
 
     private void checkAndRequestPermissions() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-            && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
-            if (getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
-                this.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
-                                        READ_EXTERNAL_STORAGE_REQUEST);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            if (getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                this.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, READ_EXTERNAL_STORAGE_REQUEST);
             }
-            if (getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
-                this.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                        WRITE_EXTERNAL_STORAGE_REQUEST);
+            if (getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                this.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, WRITE_EXTERNAL_STORAGE_REQUEST);
             }
         }
     }
@@ -154,15 +142,11 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    private void addSavegameSlotButtons(ViewGroup parent,
-                                        LayoutParams params,
-                                        List<Integer> usedSavegameSlots) {
+    private void addSavegameSlotButtons(ViewGroup parent, LayoutParams params, List<Integer> usedSavegameSlots) {
         int unused = 1;
         for (int slot : usedSavegameSlots) {
             final FileHeader header = Savegames.quickload(this, slot);
-            if (header == null) {
-                continue;
-            }
+            if (header == null) continue;
 
             while (unused < slot) {
                 Button b = new Button(this);
@@ -186,76 +170,41 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    private void cancelLoadSaveActivity(int slot) {
-        completeLoadSaveActivity(slot, false);
-    }
 
     private void completeLoadSaveActivity(int slot) {
-        completeLoadSaveActivity(slot, true);
-    }
-
-    private void completeLoadSaveActivity(int slot, boolean success) {
         Intent i = new Intent();
         if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
-            slot = getFirstFreeSlot();
+            List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
+            if (usedSlots.isEmpty())
+                slot = SLOT_NUMBER_FIRST_SLOT;
+            else slot = Collections.max(usedSlots) + 1;
         } else if (slot == SLOT_NUMBER_EXPORT_SAVEGAMES
-                   || slot == SLOT_NUMBER_IMPORT_SAVEGAMES
-                   || slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
+                || slot == SLOT_NUMBER_IMPORT_SAVEGAMES
+                || slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
             i.putExtra("import_export", true);
-
-            if (slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
-                i.putExtra("import_worldmap", true);
-            }
-            if (slot == SLOT_NUMBER_IMPORT_SAVEGAMES) {
-                i.putExtra("import_savegames", true);
-            }
-            if (slot == SLOT_NUMBER_EXPORT_SAVEGAMES) {
-                i.putExtra("export", true);
-            }
-
-        } else if (slot < SLOT_NUMBER_FIRST_SLOT) {
+        } else if (slot < SLOT_NUMBER_FIRST_SLOT)
             slot = SLOT_NUMBER_FIRST_SLOT;
-        }
 
         i.putExtra("slot", slot);
-        if (success) {
-            setResult(Activity.RESULT_OK, i);
-        } else {
-            setResult(Activity.RESULT_CANCELED, i);
-        }
+        setResult(Activity.RESULT_OK, i);
         LoadSaveActivity.this.finish();
     }
 
-    private int getFirstFreeSlot() {
-        int slot;
-        List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
-        if (usedSlots.isEmpty()) {
-            slot = SLOT_NUMBER_FIRST_SLOT;
-        } else {
-            slot = Collections.max(usedSlots) + 1;
-        }
-        return slot;
-    }
-
     private String getConfirmOverwriteQuestion(int slot) {
-        if (isLoading) {
+        if (isLoading)
             return null;
-        }
 
         return getConfirmOverwriteQuestionIgnoringLoading(slot);
     }
 
     private String getConfirmOverwriteQuestionIgnoringLoading(int slot) {
-        if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
+        if (slot == SLOT_NUMBER_CREATE_NEW_SLOT)
             return null;//creating a new savegame
-        }
 
-        if (!Savegames.getSlotFile(slot, this).exists()) {
+        if (!Savegames.getSlotFile(slot, this).exists())
             return null;//nothing in slot to overwrite
-        }
 
-        if (preferences.displayOverwriteSavegame
-            == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_ALWAYS) {
+        if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_ALWAYS) {
             return getString(R.string.loadsave_save_overwrite_confirmation_all);
         }
         if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_NEVER) {
@@ -264,14 +213,10 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
         final String currentPlayerName = model.player.getName();
         final FileHeader header = Savegames.quickload(this, slot);
-        if (header == null) {
-            return null;
-        }
+        if (header == null) return null;
 
         final String savedPlayerName = header.playerName;
-        if (currentPlayerName.equals(savedPlayerName)) {
-            return null; //if the names match
-        }
+        if (currentPlayerName.equals(savedPlayerName)) return null; //if the names match
 
         return getString(R.string.loadsave_save_overwrite_confirmation, savedPlayerName, currentPlayerName);
     }
@@ -280,7 +225,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     public void onClick(View view) {
         final int slot = (Integer) view.getTag();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             switch (slot) {
                 case SLOT_NUMBER_IMPORT_WORLDMAP:
                     clickImportWorldmap();
@@ -294,9 +239,8 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             }
         }
         if (!isLoading
-            && slot != SLOT_NUMBER_CREATE_NEW_SLOT
-            && AndorsTrailApplication.CURRENT_VERSION
-               == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
+                && slot != SLOT_NUMBER_CREATE_NEW_SLOT
+                && AndorsTrailApplication.CURRENT_VERSION == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
             if (!isOverwriteTargetInIncompatibleVersion(slot)) {
                 saveOrOverwriteSavegame(slot);
             }
@@ -310,7 +254,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     private void saveOrOverwriteSavegame(int slot) {
         final String message = getConfirmOverwriteQuestion(slot);
         if (message != null) {
-            showConfirmOverwriteQuestion(slot, message);
+            showConfirmoverwriteQuestion(slot, message);
         } else {
             completeLoadSaveActivity(slot);
         }
@@ -318,11 +262,8 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     private boolean isOverwriteTargetInIncompatibleVersion(int slot) {
         final FileHeader header = Savegames.quickload(this, slot);
-        if (header != null
-            && header.fileversion != AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
-            final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                         "Overwriting not allowed",
-                                                                         "You are currently using a development version of Andor's trail. Overwriting a regular savegame is not allowed in development mode.");
+        if (header != null && header.fileversion != AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
+            final Dialog d = CustomDialogFactory.createErrorDialog(this, "Overwriting not allowed", "You are currently using a development version of Andor's trail. Overwriting a regular savegame is not allowed in development mode.");
             CustomDialogFactory.show(d);
             return true;
         }
@@ -331,32 +272,27 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     //region Imports/Exports
 
-    //region Export
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
     private void exportSaveGames(Intent data) {
         Uri uri = data.getData();
 
         Context context = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
-                                                         .getContentResolver();
+        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this).getContentResolver();
 
-        File storageDir = AndroidStorage.getStorageDirectory(context,
-                                                             Constants.FILENAME_SAVEGAME_DIRECTORY);
+        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
+        DocumentFile source = DocumentFile.fromFile(storageDir);
         DocumentFile target = DocumentFile.fromTreeUri(context, uri);
         if (target == null) {
             return;
         }
 
-        File[] files = storageDir.listFiles();
-        if (files == null) {
-            showErrorExportingSaveGamesUnknown();
-            return;
-        }
+        DocumentFile[] files = source.listFiles();
 
         boolean hasExistingFiles = false;
-        for (File file : files) {
+        for (DocumentFile file :
+                files) {
             String fileName = file.getName();
+            if (fileName == null)
+                continue;
 
             DocumentFile existingFile = target.findFile(fileName);
             if (existingFile != null) {
@@ -368,70 +304,52 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         if (hasExistingFiles) {
             showConfirmOverwriteByExportQuestion(resolver, target, files);
         } else {
-            exportSaveGamesFolderContentToFolder(target, files);
+            exportSaveGamesFolderContentToFolder(resolver, target, files);
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void exportSaveGamesFolderContentToFolder(DocumentFile target, File[] files) {
-        DocumentFile[] sourceFiles = new DocumentFile[files.length];
+    private void exportSaveGamesFolderContentToFolder(ContentResolver resolver, DocumentFile target, DocumentFile[] files) {
+        for (DocumentFile file : files) {
+            String fileName = file.getName();
+            DocumentFile existingFile = target.findFile(fileName);
+            boolean hasExistingFile = existingFile != null && existingFile.exists();
 
-        File[] worldmapFiles = null;
-
-        for (int i = 0; i < files.length; i++) {
-            File file = files[i];
             if (file.isFile()) {
-                sourceFiles[i] = DocumentFile.fromFile(file);
-            } else if (file.isDirectory() && Objects.equals(file.getName(),
-                                                            Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-                worldmapFiles = file.listFiles();
+                try {
+                    if (hasExistingFile)
+                        existingFile.delete();
+
+
+                    AndroidStorage.copyDocumentFileToNewOrExistingFile(file, resolver, target);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            } else if (file.isDirectory()) {
+                DocumentFile targetWorlmap = existingFile;
+                //if the folder exists already, put the files in the existing folder. (should not happen because of check earlier)
+                if (!hasExistingFile)
+                    //create a new folder for the worldmap-files
+                    targetWorlmap = target.createDirectory(Constants.FILENAME_WORLDMAP_DIRECTORY);
+
+                if (targetWorlmap == null)//Unable to create worldmap folder for some reason
+                    continue;
+
+                DocumentFile[] worldmapFiles = file.listFiles();
+                for (DocumentFile f : worldmapFiles) {
+                    try {
+                        AndroidStorage.copyDocumentFileToNewOrExistingFile(f, resolver, targetWorlmap);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
             }
         }
-        Context context = this;
-        File[] finalWorldmapFiles = worldmapFiles;
-        CopyFilesToExternalFolder(target, sourceFiles, context, finalWorldmapFiles);
 
+        completeLoadSaveActivity(SLOT_NUMBER_EXPORT_SAVEGAMES);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void CopyFilesToExternalFolder(DocumentFile target,
-                                           DocumentFile[] sourceFiles,
-                                           Context context,
-                                           File[] finalWorldmapFiles) {
-        AndroidStorage.copyDocumentFilesToDirAsync(sourceFiles,
-                                                   context,
-                                                   target,
-                                                   getString(R.string.loadsave_exporting_savegames),
-                                                   (success) -> {
-                                                       if (success) {
-                                                           CopyWorldmapFilesAsZip(target,
-                                                                                  context,
-                                                                                  finalWorldmapFiles);
-                                                       } else {
-                                                           completeLoadSaveActivity(
-                                                                   SLOT_NUMBER_EXPORT_SAVEGAMES,
-                                                                   false);
-                                                       }
-                                                   });
-    }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void CopyWorldmapFilesAsZip(DocumentFile target,
-                                        Context context,
-                                        File[] finalWorldmapFiles) {
-        AndroidStorage.createZipDocumentFileFromFilesAsync(finalWorldmapFiles,
-                                                           context,
-                                                           target,
-                                                           Constants.FILENAME_WORLDMAP_DIRECTORY,
-                                                           getString(R.string.loadsave_exporting_worldmap),
-                                                           (successWorldmap) -> completeLoadSaveActivity(
-                                                                   SLOT_NUMBER_EXPORT_SAVEGAMES,
-                                                                   successWorldmap));
-    }
-
-    //endregion
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
     private void importSaveGames(Intent data) {
         Uri uri = data.getData();
         ClipData uris = data.getClipData();
@@ -442,8 +360,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
 
         Context context = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
-                .getContentResolver();
+        ContentResolver resolver = context.getContentResolver();
 
         File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
         DocumentFile appSavegameFolder = DocumentFile.fromFile(storageDir);
@@ -452,18 +369,13 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         if (uri != null) {
             uriList.add(uri);
         } else {
-            for (int i = 0; i < uris.getItemCount(); i++) {
+            for (int i = 0; i < uris.getItemCount(); i++)
                 uriList.add(uris.getItemAt(i).getUri());
-            }
         }
         importSaveGamesFromUris(context, resolver, appSavegameFolder, uriList);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void importSaveGamesFromUris(Context context,
-                                         ContentResolver resolver,
-                                         DocumentFile appSavegameFolder,
-                                         List<Uri> uriList) {
+    private void importSaveGamesFromUris(Context context, ContentResolver resolver, DocumentFile appSavegameFolder, List<Uri> uriList) {
         int count = uriList.size();
 
         ArrayList<DocumentFile> alreadyExistingFiles = new ArrayList<>();
@@ -473,11 +385,10 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             Uri item = uriList.get(i);
             DocumentFile itemFile = DocumentFile.fromSingleUri(context, item);
             boolean fileAlreadyExists = getExistsSavegameInOwnFiles(itemFile, appSavegameFolder);
-            if (fileAlreadyExists) {
+            if (fileAlreadyExists)
                 alreadyExistingFiles.add(itemFile);
-            } else {
+            else
                 newFiles.add(itemFile);
-            }
         }
 
         if (alreadyExistingFiles.size() > 0) {
@@ -487,51 +398,24 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void importSaveGames(ContentResolver resolver,
-                                 DocumentFile appSavegameFolder,
-                                 List<DocumentFile> saveFiles) {
-        int size = saveFiles.size();
-        DocumentFile[] sources = new DocumentFile[size];
-        DocumentFile[] targets = new DocumentFile[size];
-
-        boolean saveAsNew = false;
-        for (int i = 0; i < size; i++) {
-            DocumentFile file = saveFiles.get(i);
-            if (file == null) {//null is value a marker that the next should be saved as new
-                saveAsNew = true;
-                continue;
-            }
-
+    private void importSaveGames(ContentResolver resolver, DocumentFile appSavegameFolder, List<DocumentFile> saveFiles) {
+        for (DocumentFile file : saveFiles) {
             int slot = getSlotFromSavegameFileName(file.getName());
-            if (slot == -1) {
-                //invalid file name
-                continue;
-            }
-
-            if (saveAsNew) {
-                slot = getFirstFreeSlot();
-                saveAsNew = false;
-            }
-
-            String targetName = Savegames.getSlotFileName(slot);
-            sources[i] = file;
-            targets[i] = getOrCreateDocumentFile(appSavegameFolder, targetName);
+            importSaveGameFile(resolver, appSavegameFolder, file, slot);
         }
+    }
 
-        AndroidStorage.copyDocumentFilesFromToAsync(sources,
-                                                    this,
-                                                    targets,
-                                                    getString(R.string.loadsave_importing_savegames),
-                                                    (sucess) -> completeLoadSaveActivity(
-                                                            SLOT_NUMBER_IMPORT_SAVEGAMES,
-                                                            sucess));
+
+    private void completeSavegameImportAndCheckIfDone(List<Integer> importsNeedingConfirmation, int slot) {
+        importsNeedingConfirmation.remove((Object) slot);
+        if (importsNeedingConfirmation.isEmpty()) {
+            completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES);
+        }
     }
 
     private boolean getExistsSavegameInOwnFiles(DocumentFile savegameFile, DocumentFile appSavegameFolder) {
-        if (savegameFile == null) {
+        if (savegameFile == null)
             return false;
-        }
 
         DocumentFile foundFile = appSavegameFolder.findFile(Objects.requireNonNull(savegameFile.getName()));
         return foundFile != null && foundFile.exists();
@@ -539,6 +423,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     private int getSlotFromSavegameFileName(String fileName) {
         if (fileName == null || !fileName.startsWith(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX)) {
+            //TODO: Maybe output a message that the file didn't have the right name?
             return -1;
         }
         String slotStr = fileName.substring(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX.length());
@@ -548,110 +433,116 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             slot = Integer.parseInt(slotStr);
             return slot;
         } catch (NumberFormatException e) {
+            //TODO: Maybe output a message that the file didn't have the right name?
             return -1;
         }
     }
 
+    private void importSaveGameFile(ContentResolver resolver, DocumentFile appSavegameFolder, DocumentFile itemFile, int slot) {
+        String targetName = Savegames.getSlotFileName(slot);
+        DocumentFile targetFile = getOrCreateDocumentFile(appSavegameFolder, targetName);
+
+        if (targetFile == null || !targetName.equals(targetFile.getName())) {
+            showErrorImportingSaveGameUnknown();//TODO: maybe replace with a more specific error message
+            return;
+        }
+
+        try {
+            AndroidStorage.copyDocumentFile(itemFile, resolver, targetFile);
+        } catch (IOException e) {
+            showErrorImportingSaveGameUnknown();
+            e.printStackTrace();
+        }
+    }
+
     private DocumentFile getOrCreateDocumentFile(DocumentFile folder, String targetName) {
         DocumentFile targetFile = folder.findFile(targetName);//try finding the file
         if (targetFile == null)//no file found, creating new one
-        {
             targetFile = folder.createFile(Constants.NO_FILE_EXTENSION_MIME_TYPE, targetName);
-        }
         return targetFile;
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
     private void importWorldmap(Intent data) {
         Uri uri = data.getData();
 
-        Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
+        Context context = getApplicationContext();
+        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this).getContentResolver();
 
-        DocumentFile chosenZip = DocumentFile.fromSingleUri(context, uri);
-        if (chosenZip == null || !chosenZip.isFile()) {
-            showErrorImportingWorldmapWrongDirectory();
-            return;
-        }
-        String chosenZipName = chosenZip.getName();
-        if (!chosenZipName.startsWith(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-            showErrorImportingWorldmapWrongDirectory();
-            return;
-        }
-
-        File ownWorldmapFolder = getOwnWorldmapFolder(context);
-
-
-        AndroidStorage.unzipDocumentFileToDirectoryAsync(chosenZip,
-                                                         this,
-                                                         ownWorldmapFolder,
-                                                         false,
-                                                         getString(R.string.loadsave_importing_worldmap),
-                                                         (success) -> completeLoadSaveActivity(
-                                                                 SLOT_NUMBER_IMPORT_WORLDMAP,
-                                                                 success));
-    }
-
-    private File getOwnWorldmapFolder(Context context) {
         File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-        File ownWorldmapFolder = null;
-        for (File f : storageDir.listFiles()) {
-            if (f.getName().equals(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-                ownWorldmapFolder = f;
-                break;
+        DocumentFile storageFolder = DocumentFile.fromFile(storageDir);
+        DocumentFile ownWorldmapFolder = storageFolder.findFile(Constants.FILENAME_WORLDMAP_DIRECTORY);
+        if (ownWorldmapFolder == null) {
+            ownWorldmapFolder = storageFolder.createDirectory(Constants.FILENAME_WORLDMAP_DIRECTORY);
+        }
+
+        DocumentFile chosenFolder = DocumentFile.fromTreeUri(context, uri);
+        if (chosenFolder == null || !chosenFolder.isDirectory()) {
+            showErrorImportingWorldmapWrongDirectory();
+            return;
+        }
+        if (!Constants.FILENAME_WORLDMAP_DIRECTORY.equals(chosenFolder.getName())) {
+            //user did not select the worldmap folder directly
+            DocumentFile file = chosenFolder.findFile(Constants.FILENAME_WORLDMAP_DIRECTORY);
+            if (file == null || !file.isDirectory() || !Constants.FILENAME_WORLDMAP_DIRECTORY.equals(file.getName())) {
+                //could not find a worldmap folder in the users selection
+                showErrorImportingWorldmapWrongDirectory();
+                return;
+            }
+
+            chosenFolder = file;
+        }
+
+        DocumentFile[] files = chosenFolder.listFiles();
+        for (DocumentFile file : files) {
+            if (file.isFile()) {
+                try {
+                    AndroidStorage.copyDocumentFileToNewOrExistingFile(file, resolver, ownWorldmapFolder);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         }
-        if (ownWorldmapFolder == null) {
-            ownWorldmapFolder = new File(storageDir, Constants.FILENAME_WORLDMAP_DIRECTORY);
-            ownWorldmapFolder.mkdir();
-        }
-        return ownWorldmapFolder;
+
+        completeLoadSaveActivity(SLOT_NUMBER_IMPORT_WORLDMAP);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void clickExportSaveGames() {
-        showStartExportInfo(view -> startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(),
-                                                           -SLOT_NUMBER_EXPORT_SAVEGAMES));
+        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_EXPORT_SAVEGAMES);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void clickImportSaveGames() {
-        showStartImportSavesInfo(view -> startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(),
-                                                                -SLOT_NUMBER_IMPORT_SAVEGAMES));
+        startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(), -SLOT_NUMBER_IMPORT_SAVEGAMES);
+
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void clickImportWorldmap() {
-        showStartImportWorldmapInfo(view -> startActivityForResult(AndroidStorage.getNewSelectZipIntent(),
-                                                                   -SLOT_NUMBER_IMPORT_WORLDMAP));
+        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_IMPORT_WORLDMAP);
 
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showConfirmOverwriteByExportQuestion(ContentResolver resolver,
-                                                      DocumentFile targetFolder,
-                                                      File[] files) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_export_overwrite_confirmation_title),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                getString(R.string.loadsave_export_overwrite_confirmation),
-                                                                null,
-                                                                true);
+    private void showConfirmOverwriteByExportQuestion(ContentResolver resolver, DocumentFile targetFolder, DocumentFile[] files) {
+        final Dialog d = CustomDialogFactory.createDialog(this,
+                getString(R.string.loadsave_export_overwrite_confirmation_title),
+                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                getString(R.string.loadsave_export_overwrite_confirmation),
+                null,
+                true);
 
-        CustomDialogFactory.addButton(d,
-                                      android.R.string.yes,
-                                      v -> exportSaveGamesFolderContentToFolder(targetFolder, files));
+        CustomDialogFactory.addButton(d, android.R.string.yes, v -> exportSaveGamesFolderContentToFolder(resolver, targetFolder, files));
         CustomDialogFactory.addDismissButton(d, android.R.string.no);
 
         CustomDialogFactory.show(d);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
     private void showConfirmOverwriteByImportQuestion(ContentResolver resolver,
                                                       DocumentFile appSavegameFolder,
                                                       List<DocumentFile> alreadyExistingFiles,
                                                       List<DocumentFile> newFiles) {
         final String title = getString(R.string.loadsave_import_overwrite_confirmation_title);
-        String message = getString(R.string.loadsave_import_file_exists_question);
+        String message = getString(R.string.loadsave_import_overwrite_confirmation);
 
         StringBuilder sb = new StringBuilder();
         sb.append('\n');
@@ -659,96 +550,46 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
         Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
 
-        ArrayList<CustomDialog> dialogs = new ArrayList<>(amount);
-
-        for (int i = 0; i < amount; i++) {
+        for (int i = 0; i < amount && i < 3; i++) {
             DocumentFile alreadyExistingFile = alreadyExistingFiles.get(i);
-            int slot = getSlotFromSavegameFileName(alreadyExistingFile.getName());
-            FileHeader existingFileHeader = Savegames.quickload(context, slot);
-            FileHeader importedFileHeader = null;
-            try (InputStream stream = resolver.openInputStream(alreadyExistingFile.getUri());
-                 DataInputStream dataStream = new DataInputStream(stream)) {
-                importedFileHeader = new FileHeader(dataStream, true);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                continue;
-            } catch (IOException e) {
-                e.printStackTrace();
-                continue;
-            }
+            String alreadyExistingFileName = alreadyExistingFile.getName();
+            FileHeader fileHeader = Savegames.quickload(context, getSlotFromSavegameFileName(alreadyExistingFileName));
+            sb.append('\n');
+            String fileHeaderDesription = "";
+            if (fileHeader != null)
+                fileHeaderDesription = fileHeader.describe();
 
-            StringBuilder messageSb = new StringBuilder();
-            String existingFileDescription = getString(R.string.loadsave_import_existing_description,
-                                                       Integer.toString(slot),
-                                                       existingFileHeader.describe());
-            String importedFileDescription = getString(R.string.loadsave_import_imported_description,
-                                                       Integer.toString(slot),
-                                                       importedFileHeader.describe());
-            messageSb.append(getString(R.string.loadsave_import_file_exists_question,
-                                       existingFileDescription,
-                                       importedFileDescription));
-
-
-            String m = messageSb.toString();
-            CustomDialog dialog = CustomDialogFactory.createDialog(this,
-                                                                   title,
-                                                                   getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                   m,
-                                                                   null,
-                                                                   true,
-                                                                   false,
-                                                                   true);
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_keep_existing, v -> {
-                //do nothing
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_keep_imported, v -> {
-                newFiles.add(alreadyExistingFile);
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_add_as_new, v -> {
-                newFiles.add(null);//add a null element as marker to know later if the next file
-                // should be imported as new or overwrite the existing one
-                newFiles.add(alreadyExistingFile);
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addCancelButton(dialog, android.R.string.cancel);
-            CustomDialogFactory.setCancelListener(dialog, v -> {
-                completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES, false);
-            });
-
-            dialogs.add(dialog);
+            sb.append(getString(R.string.loadsave_import_overwrite_confirmation_file_pattern, alreadyExistingFileName, fileHeaderDesription));
+//            sb.append(alreadyExistingFile.getName());
         }
+        if (amount > 3) {
+            sb.append("\n...");
+        }
+        message = message + sb;
+        final Dialog d = CustomDialogFactory.createDialog(this,
+                title,
+                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                message,
+                null,
+                true);
 
-        GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void GoToNextConflictOrFinish(ContentResolver resolver,
-                                          DocumentFile appSavegameFolder,
-                                          List<DocumentFile> newFiles,
-                                          ArrayList<CustomDialog> dialogs) {
-        if (dialogs.stream().count() > 0) {
-            CustomDialog d = dialogs.remove(0);
-            CustomDialogFactory.show(d);
-        } else {
+        CustomDialogFactory.addButton(d, android.R.string.yes, v -> newFiles.addAll(alreadyExistingFiles));
+        CustomDialogFactory.addDismissButton(d, android.R.string.no);
+        CustomDialogFactory.setDismissListener(d, dialog -> {
             importSaveGames(resolver, appSavegameFolder, newFiles);
-        }
+            completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES);
+        });
+        CustomDialogFactory.show(d);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode != Activity.RESULT_OK) {
+        if (resultCode != Activity.RESULT_OK)
             return;
-        }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             switch (-requestCode) {
                 case SLOT_NUMBER_EXPORT_SAVEGAMES:
                     exportSaveGames(data);
@@ -781,90 +622,48 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     //region show Dialogs
 
-    //region Import/Export
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showStartExportInfo(OnClickListener onOk) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_export),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
-                                                                getString(R.string.loadsave_export_info),
-                                                                null,
-                                                                true);
-        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.show(d);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showStartImportSavesInfo(OnClickListener onOk) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_import_save),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
-                                                                getString(R.string.loadsave_import_save_info),
-                                                                null,
-                                                                true);
-        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.show(d);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showStartImportWorldmapInfo(OnClickListener onOk) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_import_worldmap),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
-                                                                getString(R.string.loadsave_import_worldmap_info),
-                                                                null,
-                                                                true);
-        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.show(d);
-    }
-
     private void showErrorImportingWorldmapWrongDirectory() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                     getString(R.string.loadsave_import_worldmap_unsuccessfull),
-                                                                     getString(R.string.loadsave_import_worldmap_wrong_file));
+        final Dialog d = CustomDialogFactory.createErrorDialog(this,
+                getString(R.string.loadsave_import_worldmap_unsuccessfull),
+                getString(R.string.loadsave_import_worldmap_unsuccessfull_wrong_directory));
         CustomDialogFactory.show(d);
     }
 
-    private void showErrorExportingSaveGamesUnknown() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                     getString(R.string.loadsave_export_unsuccessfull),
-                                                                     getString(R.string.loadsave_export_error_unknown));
+    private void showErrorImportingSaveGameUnknown() {
+        final Dialog d = CustomDialogFactory.createErrorDialog(this,
+                getString(R.string.loadsave_import_save_unsuccessfull),
+                getString(R.string.loadsave_import_save_unsuccessfull_unknown));
         CustomDialogFactory.show(d);
     }
 
-    //endregion
-
     private void showErrorLoadingEmptySlot() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                     getString(R.string.startscreen_error_loading_game),
-                                                                     getString(R.string.startscreen_error_loading_empty_slot));
+        final Dialog d = CustomDialogFactory.createErrorDialog(this,
+                getString(R.string.startscreen_error_loading_game),
+                getString(R.string.startscreen_error_loading_empty_slot));
         CustomDialogFactory.show(d);
     }
 
     private void showSlotGetsDeletedOnLoadWarning(final int slot) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.startscreen_attention_slot_gets_delete_on_load),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                getString(R.string.startscreen_attention_message_slot_gets_delete_on_load),
-                                                                null,
-                                                                true);
+        final Dialog d = CustomDialogFactory.createDialog(this,
+                getString(R.string.startscreen_attention_slot_gets_delete_on_load),
+                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                getString(R.string.startscreen_attention_message_slot_gets_delete_on_load),
+                null,
+                true);
         CustomDialogFactory.addButton(d, android.R.string.ok, v -> completeLoadSaveActivity(slot));
         CustomDialogFactory.show(d);
     }
 
-    private void showConfirmOverwriteQuestion(final int slot, String message) {
-		final String title = getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
-							 + getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                title,
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                message,
-                                                                null,
-                                                                true);
+    private void showConfirmoverwriteQuestion(final int slot, String message) {
+        final String title =
+                getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
+                        + getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
+        final Dialog d = CustomDialogFactory.createDialog(this,
+                title,
+                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+                message,
+                null,
+                true);
 
         CustomDialogFactory.addButton(d, android.R.string.yes, v -> completeLoadSaveActivity(slot));
         CustomDialogFactory.addDismissButton(d, android.R.string.no);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java

@@ -20,12 +20,11 @@ import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 public final class LoadingActivity extends AndorsTrailBaseActivity implements OnResourcesLoadedListener, OnSceneLoadedListener {
 
 	private WorldSetup setup;
-	private CustomDialog progressDialog;
+	private Dialog progressDialog;
 	private CloudsAnimatorView clouds_back, clouds_mid, clouds_front;
 	boolean loaded = false;
 
@@ -166,7 +165,7 @@ public final class LoadingActivity extends AndorsTrailBaseActivity implements On
 	}
 
 	private void showLoadingFailedDialog(int messageResourceID) {
-		final CustomDialog d = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_failed_title), null, getResources().getString(messageResourceID), null, true);
+		final Dialog d = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_failed_title), null, getResources().getString(messageResourceID), null, true);
 		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
 		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
 			@Override

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java

@@ -43,7 +43,6 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CombatView;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 import com.gpl.rpg.AndorsTrail.view.DisplayActiveActorConditionIcons;
 import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 import com.gpl.rpg.AndorsTrail.view.MainView;
@@ -248,7 +247,7 @@ public final class MainActivity
 					final ItemContainerAdapter inventoryListAdapter = new QuickslotsItemContainerAdapter(lv.getContext(), world.tileManager, world.model.player.inventory.usableItems(), world.model.player, wornTiles);
 					lv.setAdapter(inventoryListAdapter);
 
-					final CustomDialog d = CustomDialogFactory.createDialog(v.getContext(),
+					final Dialog d = CustomDialogFactory.createDialog(v.getContext(), 
 							v.getResources().getString(R.string.inventory_assign), 
 							v.getResources().getDrawable(R.drawable.ui_icon_equipment), 
 							v.getResources().getString(R.string.inventory_selectitem), view, false);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java

@@ -2,7 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentTabHost;
+import android.support.v4.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java

@@ -11,7 +11,6 @@ import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -21,8 +20,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -115,7 +114,7 @@ public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity i
 	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
 		if (grantResults.length > 0 && grantResults[0] != PackageManager.PERMISSION_GRANTED) {
 
-			final CustomDialog d = CustomDialogFactory.createDialog(this,
+			final Dialog d = CustomDialogFactory.createDialog(this,
 					getResources().getString(R.string.dialog_permission_information_title),
 					getResources().getDrawable(android.R.drawable.ic_dialog_info),
 					getResources().getString(R.string.dialog_permission_information),

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java

@@ -5,7 +5,7 @@ import java.util.Arrays;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java

@@ -8,7 +8,7 @@ import java.util.Map;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java

@@ -4,7 +4,7 @@ import java.util.HashSet;
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java

@@ -12,7 +12,7 @@ import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -38,7 +38,6 @@ import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 public class StartScreenActivity_MainMenu extends Fragment {
 
@@ -65,11 +64,11 @@ public class StartScreenActivity_MainMenu extends Fragment {
 		}
 		
 		View root = inflater.inflate(R.layout.startscreen_mainmenu, container, false);
-
+		
 		save_preview_holder = (ViewGroup) root.findViewById(R.id.save_preview_holder);
 		save_preview_hero_icon = (ImageView) root.findViewById(R.id.save_preview_hero_icon);
 		save_preview_hero_desc = (TextView) root.findViewById(R.id.save_preview_hero_desc);
-
+		
 
 		startscreen_continue = (Button) root.findViewById(R.id.startscreen_continue);
 		startscreen_continue.setOnClickListener(new OnClickListener() {
@@ -115,7 +114,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
 				AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
 				if (hasExistingGame && app != null && app.getWorld() != null && app.getWorld().model != null
 						&& app.getWorld().model.statistics != null && !app.getWorld().model.statistics.hasUnlimitedSaves()) {
-					final CustomDialog d = CustomDialogFactory.createDialog(getActivity(),
+					final Dialog d = CustomDialogFactory.createDialog(getActivity(),
 							getString(R.string.startscreen_load_game),
 							getResources().getDrawable(android.R.drawable.ic_delete),
 							getString(R.string.startscreen_load_game_confirm),
@@ -135,7 +134,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
 				}
 			}
 		});
-
+		
 
 		if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
 			if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
@@ -153,14 +152,14 @@ public class StartScreenActivity_MainMenu extends Fragment {
 			checkAndRequestPermissions(getActivity());
 			migrateDataOnDemand(getActivity());
 		}
-
+		
 		return root;
 	}
-
+	
 	@Override
 	public void onResume() {
 		super.onResume();
-
+		
 		String playerName;
 		String displayInfo = null;
 		int iconID = TileManager.CHAR_HERO;
@@ -190,10 +189,14 @@ public class StartScreenActivity_MainMenu extends Fragment {
 					setCurrentVersionForVersionCheck();
 					checkAndRequestPermissions(getActivity());
 					migrateDataOnDemand(getActivity());
+					boolean hasSavegames = !Savegames.getUsedSavegameSlots(getActivity()).isEmpty();
+					startscreen_load.setEnabled(hasSavegames);
 				}
 			});
 		}
 
+		boolean hasSavegames = !Savegames.getUsedSavegameSlots(getActivity()).isEmpty();
+		startscreen_load.setEnabled(hasSavegames);
 	}
 
 	@TargetApi(29)
@@ -201,16 +204,23 @@ public class StartScreenActivity_MainMenu extends Fragment {
 		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())) {
-					final CustomDialog d = CustomDialogFactory.createDialog(activity,
+					final Dialog d = CustomDialogFactory.createDialog(activity,
 							getString(R.string.startscreen_migration_title),
 							activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
 							getString(R.string.startscreen_migration_text),
 							null,
 							true);
 					CustomDialogFactory.addDismissButton(d, android.R.string.ok);
+					d.setOnDismissListener(new DialogInterface.OnDismissListener() {
+						@Override
+						public void onDismiss(DialogInterface arg0) {
+							boolean hasSavegames = !Savegames.getUsedSavegameSlots(getActivity()).isEmpty();
+							startscreen_load.setEnabled(hasSavegames);
+						}
+					});
 					CustomDialogFactory.show(d);
 					if (!AndroidStorage.migrateToInternalStorage(activity.getApplicationContext())) {
-						final CustomDialog errorDlg = CustomDialogFactory.createDialog(activity,
+						final Dialog errorDlg = CustomDialogFactory.createDialog(activity,
 								getString(R.string.startscreen_migration_title),
 								activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
 								getString(R.string.startscreen_migration_failure),
@@ -249,13 +259,13 @@ public class StartScreenActivity_MainMenu extends Fragment {
 		super.onAttach(activity);
 		listener = (OnNewGameRequestedListener) activity;
 	}
-
+	
 	@Override
 	public void onDetach() {
 		super.onDetach();
 		listener = null;
 	}
-
+	
 	private void setButtonState(final String playerName, final String displayInfo, int iconID, boolean isDead) {
 		startscreen_continue.setEnabled(hasExistingGame && !isDead);
 		startscreen_newgame.setEnabled(true);
@@ -295,9 +305,9 @@ public class StartScreenActivity_MainMenu extends Fragment {
 //		.create().show();
 //		
 //		
-		final CustomDialog d = CustomDialogFactory.createDialog(getActivity(),
-				getString(R.string.startscreen_newgame),
-				getResources().getDrawable(android.R.drawable.ic_delete),
+		final Dialog d = CustomDialogFactory.createDialog(getActivity(),
+				getString(R.string.startscreen_newgame), 
+				getResources().getDrawable(android.R.drawable.ic_delete), 
 				getResources().getString(R.string.startscreen_newgame_confirm),
 				null,
 				true);
@@ -308,9 +318,9 @@ public class StartScreenActivity_MainMenu extends Fragment {
 			}
 		});
 		CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
-
+		
 		CustomDialogFactory.show(d);
-
+		
 	}
 
 	private static final String versionCheck = "lastversion";
@@ -327,23 +337,16 @@ public class StartScreenActivity_MainMenu extends Fragment {
 		e.putInt(versionCheck, AndorsTrailApplication.CURRENT_VERSION);
 		e.commit();
 	}
-
+	
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         switch (requestCode) {
             case INTENTREQUEST_LOADGAME:
-				boolean unsuccessful = resultCode != Activity.RESULT_OK;
-				if(data == null) break;
-
+                if (resultCode != Activity.RESULT_OK) break;
                 final boolean wasImportOrExport = data.getBooleanExtra("import_export", false);
-                if (wasImportOrExport) {
-					String message = getImportExportMessage(!unsuccessful, data);
-					Toast.makeText(getActivity(), message, Toast.LENGTH_LONG).show();
-					break;
-				}
-				if (unsuccessful) break;
+                if (wasImportOrExport) break;
                 final int slot = data.getIntExtra("slot", 1);
                 continueGame(false, slot, null);
                 break;
@@ -353,24 +356,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
         }
     }
 
-	private String getImportExportMessage(boolean successful, Intent data) {
-		String message = "";
-		boolean isImportWorldmap = data.getBooleanExtra("import_worldmap", false);
-		boolean isImportSaves = data.getBooleanExtra("import_savegames", false);
-		boolean isExport = data.getBooleanExtra("export", false);
-
-		if(isImportWorldmap) {
-			message = getString(successful ? R.string.loadsave_import_worldmap_successfull : R.string.loadsave_import_worldmap_unsuccessfull);
-		} else if(isImportSaves) {
-			message = getString(successful ? R.string.loadsave_import_save_successfull : R.string.loadsave_import_save_unsuccessfull);
-		} else if(isExport) {
-			message = getString(successful ? R.string.loadsave_export_successfull : R.string.loadsave_export_unsuccessfull);
-		}
-
-		return message;
-	}
-
-	private void updatePreferences(boolean alreadyStartedLoadingResources) {
+    private void updatePreferences(boolean alreadyStartedLoadingResources) {
         AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
         AndorsTrailPreferences preferences = app.getPreferences();
         preferences.read(getActivity());
@@ -399,18 +385,18 @@ public class StartScreenActivity_MainMenu extends Fragment {
         getActivity().finish();
     }
 
-
+	
 	public interface OnNewGameRequestedListener {
 		public void onNewGameRequested();
 	}
-
+	
 	private OnNewGameRequestedListener listener = null;
-
+	
 	private void createNewGame() {
 		if (listener != null) {
 			listener.onNewGameRequested();
 		}
 	}
-
+	
 
 }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java

@@ -3,7 +3,7 @@ package com.gpl.rpg.AndorsTrail.activity.fragment;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java

@@ -7,7 +7,7 @@ import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class Constants {
-	public static final int PERCENT_EXP_LOST_WHEN_DIED = 20;
+	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
 	public static final int LEVELUP_EFFECT_HEALTH = 5;
 	public static final int LEVELUP_EFFECT_ATK_CH = 5;
 	public static final int LEVELUP_EFFECT_ATK_DMG = 1;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java

@@ -22,7 +22,6 @@ import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
@@ -125,9 +124,6 @@ public final class ConversationController {
 			case changeMapFilter:
 				changeMapFilter(res, effect.mapName, effect.effectID);
 				break;
-			case mapchange:
-				mapchange(effect.mapName, effect.effectID);
-				break;
 		}
 	}
 
@@ -176,13 +172,6 @@ public final class ConversationController {
 		}
 	}
 
-	private void mapchange(String mapName, String place) {
-		PredefinedMap map = findMapForScriptEffect(mapName);
-//		controllers.mapController.activateMapObjectGroup(map, mapObjectGroupID);
-//		controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, effect.mapName, effect.effectID, 0, 0); //cbcbcb check
-		controllers.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, mapName, place, 0, 0);
-	}
-
 	private void addAlignmentReward(Player player, String faction, int delta) {
 		player.addAlignment(faction, delta);
 		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
@@ -322,18 +311,6 @@ public final class ConversationController {
 			case factionScoreEquals:
 				result = player.getAlignment(requirement.requireID) == requirement.value;
 				break;
-			case date:
-				result = world.model.worldData.getDate(requirement.requireID) >= requirement.value;
-				break;
-			case dateEquals:
-				result = world.model.worldData.getDate(requirement.requireID) == requirement.value;
-				break;
-			case time:
-				result = world.model.worldData.getTime(requirement.requireID) >= requirement.value;
-				break;
-			case timeEquals:
-				result = world.model.worldData.getTime(requirement.requireID) == requirement.value;
-				break;
 			default:
 				result =  true;
 		}

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/WorldData.java

@@ -6,8 +6,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import java.util.Calendar;
-
 public final class WorldData {
 	private long worldTime = 0; // Measured in number of game rounds
 	private final HashMap<String, Long> timers = new HashMap<String, Long>();
@@ -38,62 +36,6 @@ public final class WorldData {
 		return v + duration <= worldTime;
 	}
 
-	public int getDate(String format) {
-		Calendar now = Calendar.getInstance();
-		int ret;
-		switch (format) {
-			case "YYYYMMDD":
-				ret = now.get(Calendar.YEAR)*10000 + (now.get(Calendar.MONTH) + 1)*100 + now.get(Calendar.DAY_OF_MONTH);
-				break;
-			case "YYYYMM":
-				ret = now.get(Calendar.YEAR)*100 + (now.get(Calendar.MONTH) + 1);
-				break;
-			case "YYYY":
-				ret = now.get(Calendar.YEAR);
-				break;
-			case "MMDD":
-				ret = (now.get(Calendar.MONTH) + 1)*100 + now.get(Calendar.DAY_OF_MONTH);
-				break;
-			case "MM":
-				ret = (now.get(Calendar.MONTH) + 1);
-				break;
-			case "DD":
-				ret = now.get(Calendar.DAY_OF_MONTH);
-				break;
-			default:
-				ret = 99999999;		//never true
-		}
-		return ret;
-	}
-
-	public int getTime(String format) {
-		Calendar now = Calendar.getInstance();
-		int ret;
-		switch (format) {
-			case "HHMMSS":
-				ret = now.get(Calendar.HOUR_OF_DAY)*10000 + now.get(Calendar.MINUTE)*100 + now.get(Calendar.SECOND);
-				break;
-			case "HHMM":
-				ret = now.get(Calendar.HOUR_OF_DAY)*100 + now.get(Calendar.MINUTE);
-				break;
-			case "HH":
-				ret = now.get(Calendar.HOUR_OF_DAY);
-				break;
-			case "MMSS":
-				ret = now.get(Calendar.MINUTE)*100 + now.get(Calendar.SECOND);
-				break;
-			case "MM":
-				ret = now.get(Calendar.MINUTE);
-				break;
-			case "SS":
-				ret = now.get(Calendar.SECOND);
-				break;
-			default:
-				ret = 99999999;		//never true
-		}
-		return ret;
-	}
-
 	// ====== PARCELABLE ===================================================================
 
 	public WorldData(DataInputStream src, int fileversion) throws IOException {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java

@@ -83,7 +83,7 @@ public final class SkillCollection {
 	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT = 30;
 	public static final int PER_SKILLPOINT_INCREASE_MAGICFINDER_CHANCE_PERCENT = 50;
 	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_QUANTITY_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 10;
+	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 5;
 	public static final int PER_SKILLPOINT_INCREASE_CLEAVE_AP = 3;
 	public static final int PER_SKILLPOINT_INCREASE_EATER_HEALTH = 1;
 	public static final int PER_SKILLPOINT_INCREASE_FORTITUDE_HEALTH = 1;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java

@@ -111,7 +111,7 @@ public final class Player extends Actor {
 		baseTraits.criticalSkill = 0;
 		baseTraits.criticalMultiplier = 1;
 		baseTraits.damagePotential.set(1, 1);
-		baseTraits.blockChance = 9;
+		baseTraits.blockChance = 0;
 		baseTraits.damageResistance = 0;
 		baseTraits.useItemCost = 5;
 		baseTraits.reequipCost = 5;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java

@@ -17,7 +17,7 @@ import com.gpl.rpg.AndorsTrail.util.Range;
 public final class MonsterSpawnArea {
 	public final CoordRect area;
 	public final Range quantity;
-	private final Range respawnspeed;
+	private final Range spawnChance;
 	public final String areaID;
 	public final String[] monsterTypeIDs;
 	public final List<Monster> monsters = new CopyOnWriteArrayList<Monster>();
@@ -30,7 +30,7 @@ public final class MonsterSpawnArea {
 	public MonsterSpawnArea(
 			CoordRect area
 			, Range quantity
-			, Range respawnspeed
+			, Range spawnChance
 			, String areaID
 			, String[] monsterTypeIDs
 			, boolean isUnique
@@ -40,7 +40,7 @@ public final class MonsterSpawnArea {
 	) {
 		this.area = area;
 		this.quantity = quantity;
-		this.respawnspeed = respawnspeed;
+		this.spawnChance = spawnChance;
 		this.areaID = areaID;
 		this.monsterTypeIDs = monsterTypeIDs;
 		this.isUnique = isUnique;
@@ -101,7 +101,7 @@ public final class MonsterSpawnArea {
 	}
 
 	public boolean rollShouldSpawn() {
-		return Constants.rollResult(respawnspeed);
+		return Constants.rollResult(spawnChance);
 	}
 
 	public void removeAllMonsters() {

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java

@@ -115,7 +115,7 @@ public final class TMXMapTranslator {
 						boolean isActiveForNewGame = true;
 						boolean ignoreAreas = false;
 						int maxQuantity = 1;
-						int respawnspeed = 10;
+						int spawnChance = 10;
 						String spawnGroup = object.name;
 						for (TMXProperty p : object.properties) {
 							if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
@@ -126,8 +126,8 @@ public final class TMXMapTranslator {
 							}
 							if (p.name.equalsIgnoreCase("quantity")) {
 								maxQuantity = Integer.parseInt(p.value);
-							} else if (p.name.equalsIgnoreCase("respawnspeed")) {
-								respawnspeed = Integer.parseInt(p.value);
+							} else if (p.name.equalsIgnoreCase("spawnchance")) {
+								spawnChance = Integer.parseInt(p.value);
 							} else if (p.name.equalsIgnoreCase("active")) {
 								isActiveForNewGame = Boolean.parseBoolean(p.value);
 							} else if (p.name.equalsIgnoreCase("ignoreAreas")) {
@@ -155,7 +155,7 @@ public final class TMXMapTranslator {
 						MonsterSpawnArea area = new MonsterSpawnArea(
 								position
 								,new Range(maxQuantity, 0)
-								,new Range(1000, respawnspeed)
+								,new Range(1000, spawnChance)
 								,object.name
 								,monsterTypeIDs
 								,isUnique
@@ -405,11 +405,6 @@ public final class TMXMapTranslator {
 				int tileID = tileCache.getTileID(tile.tilesetName, tile.localId);
 				result.tiles[dx][dy] = tileID;
 				usedTileIDs.add(tileID);
-				if(AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA){
-					if(tileID == 0){
-						L.log("Tileid 0 in "+ tile.tilesetName);
-					}
-				}
 			}
 		}
 		return result;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/Requirement.java

@@ -21,10 +21,6 @@ public final class Requirement {
 		,random
 		,factionScoreEquals
 		,wearRemove
-		,date
-		,dateEquals
-		,time
-		,timeEquals
 	}
 
 	public final RequirementType requireType;
@@ -87,10 +83,6 @@ public final class Requirement {
 			case skillLevel:
 				return requireID != null && value >= 0;
 			case spentGold:
-			case date:
-			case dateEquals:
-			case time:
-			case timeEquals:
 				return value >= 0;
 			case random:
 				return chance != null;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java

@@ -18,7 +18,6 @@ public final class ScriptEffect {
 		, deactivateMapObjectGroup
 		, removeQuestProgress
 		, changeMapFilter
-		, mapchange
 	}
 
 	public final ScriptEffectType type;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java

@@ -250,7 +250,6 @@ public final class ResourceLoader {
 
 	private static void prepareTilesets(DynamicTileLoader loader, int mTileSize) {
 		final Size sz1x1 = new Size(1, 1);
-		final Size sz1x2 = new Size(1, 2);
 		final Size sz2x1 = new Size(2, 1);
 		final Size sz2x2 = new Size(2, 2);
 		final Size sz2x3 = new Size(2, 3);
@@ -259,7 +258,6 @@ public final class ResourceLoader {
 		final Size sz6x1 = new Size(6, 1);
 		final Size sz7x1 = new Size(7, 1);
 		final Size sz8x3 = new Size(8, 3);
-		final Size sz16x8 = new Size(16, 8);
 		final Size sz20x12 = new Size(20, 12);
 		final Size mapTileSize = new Size(16, 8);
 		final Size sz8x8 = new Size(8, 8);
@@ -301,19 +299,15 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.items_necklaces_1, "items_necklaces_1", new Size(10, 3), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.items_weapons_2, "items_weapons_2", new Size(7, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.items_weapons_3, "items_weapons_3", new Size(13, 5), sz1x1, mTileSize);
-
 		loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", sz7x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.items_armours_3, "items_armours_3", new Size(10, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", new Size(10, 3), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_japozero, "items_japozero", new Size(16, 37), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_rijackson_1, "items_rijackson_1", new Size(5, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_g03_package_omi1, "items_g03_package_omi1", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.items_consumables_omi1, "items_consumables_omi1", sz1x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.items_feygard1, "items_feygard1", new Size(6, 2), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_g03_package_omi1, "items_g03_package_omi1", sz1x1, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_japozero, "items_japozero", new Size(16, 37), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_newb, "items_newb", new Size(32, 27), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.items_omi2, "items_omi2", new Size(6, 5), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_omgeeky, "items_omgeeky", new Size(10, 3), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_phoenix01, "items_phoenix01", sz16x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_rijackson_1, "items_rijackson_1", new Size(5, 4), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", new Size(10, 3), sz1x1, mTileSize);
 		/*INSERT_ITEMS_TILESETS_HERE*/
 		
 		loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", sz1x1, sz1x1, mTileSize);
@@ -339,10 +333,6 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.monsters_men, "monsters_men", new Size(9, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_men2, "monsters_men2", new Size(10, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_misc, "monsters_misc", new Size(13, 1), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_1, "monsters_newb_1", new Size(40, 34), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_2, "monsters_newb_2", new Size(16, 2), sz1x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_3, "monsters_newb_3", new Size(20, 4), sz2x2, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_newb_4, "monsters_newb_4", new Size(4, 2), sz2x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_rats, "monsters_rats", new Size(5, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_redshrike1, "monsters_redshrike1", sz7x1, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), sz1x1, mTileSize);
@@ -377,12 +367,9 @@ public final class ResourceLoader {
         loader.prepareTileset(R.drawable.monsters_gisons, "monsters_gisons", new Size(8, 2), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_bosses_2x2, "monsters_bosses_2x2", sz1x1, sz2x2, mTileSize);
 		loader.prepareTileset(R.drawable.monsters_omi2, "monsters_omi2", sz8x3, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_phoenix01, "monsters_phoenix01", sz16x8, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.monsters_cats, "monsters_cats", new Size(10, 2), sz1x1, mTileSize);
 		/*INSERT_NPCS_TILESETS_HERE*/
 		
 		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_boats_1, "map_boats_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_border_1, "map_border_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_bridge_2, "map_bridge_2", mapTileSize, sz1x1, mTileSize);
@@ -391,7 +378,6 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_cavewall_2, "map_cavewall_2", new Size(18, 6), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_cavewall_3, "map_cavewall_3", new Size(18, 6), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_cavewall_4, "map_cavewall_4", new Size(18, 6), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_cavewall_5, "map_cavewall_5", new Size(6, 6), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_chair_table_1, "map_chair_table_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_chair_table_2, "map_chair_table_2", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_crate_1, "map_crate_1", mapTileSize, sz1x1, mTileSize);
@@ -411,8 +397,6 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_ground_6, "map_ground_6", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_ground_7, "map_ground_7", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_ground_8, "map_ground_8", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_ground_9, "map_ground_9", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_guynmart, "map_guynmart", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_house_1, "map_house_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_house_2, "map_house_2", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_indoor_1, "map_indoor_1", mapTileSize, sz1x1, mTileSize);
@@ -421,43 +405,36 @@ public final class ResourceLoader {
 		loader.prepareTileset(R.drawable.map_outdoor_1, "map_outdoor_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_pillar_1, "map_pillar_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_pillar_2, "map_pillar_2", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_pillar_3, "map_pillar_3", new Size(16, 10), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_plant_1, "map_plant_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_plant_2, "map_plant_2", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_plant_3, "map_plant_3", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_plateau, "map_plateau", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_plateau_2, "map_plateau_2", new Size(8, 8), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_ratdom, "map_ratdom", new Size(18, 6), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_rock_1, "map_rock_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_rock_2, "map_rock_2", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_rock_3, "map_rock_3", new Size(6, 5), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_roof_1, "map_roof_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_roof_2, "map_roof_2", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_roof_3, "map_roof_3", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_roof_4, "map_roof_4", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_roof_5, "map_roof_5", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_shop_1, "map_shop_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_sign_ladder_1, "map_sign_ladder_1", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_sign_ladder_omi2, "map_sign_ladder_omi2", new Size(8, 4), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_table_1, "map_table_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_table_2, "map_table_2", new Size(14, 8), sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_temple_1, "map_temple_1", new Size(23, 16), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_trail_1, "map_trail_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_1, "map_transition_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_2, "map_transition_2", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_3, "map_transition_3", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_4, "map_transition_4", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_transition_5, "map_transition_5", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_transition_6, "map_transition_6", new Size(18, 8), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_tree_1, "map_tree_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_tree_2, "map_tree_2", mapTileSize, sz1x1, mTileSize);
-		loader.prepareTileset(R.drawable.map_tree_3, "map_tree_3", new Size(32, 17), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_wall_1, "map_wall_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_wall_2, "map_wall_2", new Size(15, 8), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_wall_3, "map_wall_3", new Size(15, 8), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_wall_4, "map_wall_4", new Size(15, 8), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_window_1, "map_window_1", mapTileSize, sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.map_window_2, "map_window_2", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_guynmart, "map_guynmart", mapTileSize, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_5, "map_cavewall_5", new Size(6, 6), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_rock_3, "map_rock_3", new Size(6, 5), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_sign_ladder_omi2, "map_sign_ladder_omi2", new Size(8, 4), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.map_transition_6, "map_transition_6", new Size(18, 8), sz1x1, mTileSize);
 		/*INSERT_MAP_TILESETS_HERE*/
 
 		loader.prepareTileset(R.drawable.effect_blood4, "effect_blood4", new Size(7, 2), sz1x1, mTileSize);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java

@@ -12,8 +12,6 @@ import android.graphics.Bitmap;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.LruCache;
 
 public final class TileCache {
@@ -41,12 +39,7 @@ public final class TileCache {
 		tileIDsPerLocalID.put(localID, tileID);
 	}
 	public int getTileID(String tileSetName, int localID) {
-
-		SparseIntArray sparseIntArray = tileIDsPerTilesetAndLocalID.get(tileSetName);
-		if(AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES && sparseIntArray == null){
-			L.log("Could not get tile " + tileSetName + " " + localID);
-		}
-		return sparseIntArray.get(localID);
+		return tileIDsPerTilesetAndLocalID.get(tileSetName).get(localID);
 	}
 
 	private static final class ResourceFileTile {
@@ -74,9 +67,6 @@ public final class TileCache {
 		HashMap<ResourceFileTileset, SparseArray<ResourceFileTile>> tilesToLoadPerSourceFile = new HashMap<ResourceFileTileset, SparseArray<ResourceFileTile>>();
 		for(int tileID : iconIDs) {
 			ResourceFileTile tile = resourceTiles[tileID];
-			if(tile == null && AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
-				L.log("could not find resourceTiles for id: " + tileID);
-			}
 			SparseArray<ResourceFileTile> tiles = tilesToLoadPerSourceFile.get(tile.tileset);
 			if (tiles == null) {
 				tiles = new SparseArray<TileCache.ResourceFileTile>();

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java

@@ -18,7 +18,6 @@ import android.os.AsyncTask;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -34,7 +33,6 @@ import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
-import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class TileManager {
@@ -376,10 +374,6 @@ public final class TileManager {
 			cachedTileIDs = getTileIDsFor(adjacentMap, adjacentMapTiles, world);
 			tileIDsPerMap.put(mapName, cachedTileIDs);
 		}
-
-		if(AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
-			L.log("TileIDsFor " + mapName + "\n" + cachedTileIDs);
-		}
 		dest.addAll(cachedTileIDs);
 	}
 	public void cacheAdjacentMaps(final Resources res, final WorldContext world, final PredefinedMap nextMap) {
@@ -397,9 +391,6 @@ public final class TileManager {
 
 				HashSet<Integer> tileIDs = new HashSet<Integer>();
 				for (String mapName : adjacentMapNames) {
-					if(AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES){
-						L.log("addTileIDsFor " + mapName);
-					}
 					addTileIDsFor(tileIDs, mapName, res, world);
 				}
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java

@@ -6,36 +6,27 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import androidx.annotation.RequiresApi;
-import androidx.core.content.FileProvider;
-import androidx.documentfile.provider.DocumentFile;
+import android.support.annotation.NonNull;
+import android.support.annotation.RequiresApi;
+import android.support.v4.content.FileProvider;
+import android.support.v4.provider.DocumentFile;
+import android.webkit.MimeTypeMap;
 
-import android.os.Handler;
-import android.os.Looper;
-
-import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.util.BackgroundWorker.BackgroundWorkerCallback;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.concurrent.CancellationException;
-import java.util.function.Consumer;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
 public final class AndroidStorage {
     public static File getStorageDirectory(Context context, String name) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             return context.getExternalFilesDir(name);
-        } else {
+        }
+        else {
             File root = Environment.getExternalStorageDirectory();
             return new File(root, name);
         }
@@ -43,16 +34,16 @@ public final class AndroidStorage {
 
     public static boolean shouldMigrateToInternalStorage(Context context) {
         boolean ret = false;
-        File externalSaveGameDirectory = new File(Environment.getExternalStorageDirectory(),
-                                                  Constants.FILENAME_SAVEGAME_DIRECTORY);
+        File externalSaveGameDirectory = new File(Environment.getExternalStorageDirectory(), 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 < 2)) {
+                && externalSaveGameDirectory.isDirectory()
+                && externalSaveGameDirectory.listFiles().length > 0
+                && (
+                !internalSaveGameDirectory.exists()
+                        || internalSaveGameDirectory.isDirectory() && internalSaveGameDirectory.listFiles().length < 2)
+                ) {
             ret = true;
         }
         return ret;
@@ -61,11 +52,11 @@ public final class AndroidStorage {
     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);
+            L.log("Error migrating data: " + e.toString());
             return false;
         }
         return true;
@@ -106,187 +97,68 @@ public final class AndroidStorage {
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    public static void createZipDocumentFileFromFilesAsync(File[] files,
-                                                           Context context,
-                                                           DocumentFile targetDirectory,
-                                                           String fileName,
-                                                           String loadingMessage,
-                                                           Consumer<Boolean> callback) {
 
-        BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
-        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
-        progressDialog.setOnCancelListener(dialog -> worker.cancel());
-        ContentResolver resolver = context.getContentResolver();
-        Handler handler = Handler.createAsync(Looper.getMainLooper());
-
-
-        worker.setTask(workerCallback -> {
-            try {
-                workerCallback.onInitialize();
-
-                //region create zip file
-                File zip = File.createTempFile("temp_worldmap", ".zip");
-                try (OutputStream out = new FileOutputStream(zip)) {
-                    ZipOutputStream zipOut = new ZipOutputStream(out);
-                    for (int i = 0; i < files.length; i++) {
-                        File file = files[i];
-                        try (FileInputStream fis = new FileInputStream(file)) {
-                            workerCallback.onProgress((float) i / files.length);
-                            zipOut.putNextEntry(new ZipEntry(file.getName()));
-                            copyStream(fis, zipOut);
-                            zipOut.closeEntry();
-                        }
-                    }
-                    zipOut.close();
-                }
-                //endregion
-
-                DocumentFile worldmapZip = DocumentFile.fromFile(zip);
-                DocumentFile worldmapTarget = targetDirectory.createFile("application/zip", fileName);
-                if (worldmapTarget != null && worldmapTarget.exists()) {
-                    AndroidStorage.copyDocumentFile(worldmapZip, resolver, worldmapTarget);
-                    workerCallback.onComplete(true);
-                } else {
-                    throw new FileNotFoundException("Could not create File");
-                }
-            } catch (NullPointerException e) {
-                if (worker.isCancelled()) {
-                    workerCallback.onFailure(new CancellationException("Cancelled"));
-                } else {
-                    workerCallback.onFailure(e);
-                }
-            } catch (Exception e) {
-                workerCallback.onFailure(e);
-            }
-        });
-
-        worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
-        worker.run();
-
-
-    }
-
-    public static void unzipToDirectory(File zipFile,
-                                        File targetDirectory,
-                                        boolean overwriteNotSkip) throws IOException {
-
-        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) {
-            unzipStreamToDirectory(targetDirectory, overwriteNotSkip, zis);
-        }
-
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    public static void unzipDocumentFileToDirectoryAsync(DocumentFile zipFile,
-                                                         Context context,
-                                                         File targetDirectory,
-                                                         boolean overwriteNotSkip,
-                                                         String loadingMessage,
-                                                         Consumer<Boolean> callback) {
-
-        BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
-        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
-        progressDialog.setOnCancelListener(dialog -> worker.cancel());
-        ContentResolver resolver = context.getContentResolver();
-        Handler handler = Handler.createAsync(Looper.getMainLooper());
-
-        worker.setTask(workerCallback -> {
-            try {
-                workerCallback.onInitialize();
-                workerCallback.onProgress(-1);//set dummy progress since we don't know the
-                // progress of the unzip
-                unzipDocumentFileToDirectory(zipFile, resolver, targetDirectory, overwriteNotSkip);
-                workerCallback.onComplete(true);
-            } catch (IOException e) {
-                workerCallback.onFailure(e);
-            }
-        });
-
-        worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
-        worker.run();
-
-    }
-
-    public static void unzipDocumentFileToDirectory(DocumentFile zipFile,
-                                                    ContentResolver resolver,
-                                                    File targetDirectory,
-                                                    boolean overwriteNotSkip) throws IOException {
-        try (ZipInputStream zis = new ZipInputStream(resolver.openInputStream(zipFile.getUri()))) {
-            unzipStreamToDirectory(targetDirectory, overwriteNotSkip, zis);
-        }
-    }
-
-    private static void unzipStreamToDirectory(File targetDirectory,
-                                               boolean overwriteNotSkip,
-                                               ZipInputStream zis) throws IOException {
-        ZipEntry entry;
-        while ((entry = zis.getNextEntry()) != null) {
-            File file = new File(targetDirectory, entry.getName());
-
-            if (entry.isDirectory()) {
-                file.mkdirs();
-            } else {
-                file.getParentFile().mkdirs();
-                if (file.exists() && !overwriteNotSkip) {
-                    continue;
-                }
-
-                try (FileOutputStream fos = new FileOutputStream(file)) {
-                    copyStream(zis, fos);
-                }
-            }
-        }
-    }
-
-    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile,
-                                                           ContentResolver resolver,
-                                                           DocumentFile targetFolder) throws IOException {
-        copyDocumentFileToNewOrExistingFile(sourceFile,
-                                            resolver,
-                                            targetFolder,
-                                            Constants.NO_FILE_EXTENSION_MIME_TYPE);
+    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile, ContentResolver resolver, DocumentFile targetFolder) throws IOException {
+        copyDocumentFileToNewOrExistingFile(sourceFile, resolver, targetFolder, Constants.NO_FILE_EXTENSION_MIME_TYPE);
     }
 
 
-    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile,
-                                                           ContentResolver resolver,
-                                                           DocumentFile targetFolder,
-                                                           String mimeType) throws IOException {
+    public static void copyDocumentFileToNewOrExistingFile(DocumentFile sourceFile, ContentResolver resolver, DocumentFile targetFolder, String mimeType) throws IOException {
         String fileName = sourceFile.getName();
         DocumentFile file = targetFolder.findFile(fileName);
-        if (file == null) {
+        if (file == null)
             file = targetFolder.createFile(mimeType, fileName);
-        }
-        if (file == null) {
+        if (file == null)
             return;
-        }
 
         AndroidStorage.copyDocumentFile(sourceFile, resolver, file);
     }
 
-    public static void copyDocumentFile(DocumentFile sourceFile,
-                                        ContentResolver resolver,
-                                        DocumentFile targetFile) throws IOException {
+    public static void copyDocumentFile(DocumentFile sourceFile, ContentResolver resolver, DocumentFile targetFile) throws IOException {
         try (OutputStream outputStream = resolver.openOutputStream(targetFile.getUri());
              InputStream inputStream = resolver.openInputStream(sourceFile.getUri())) {
             copyStream(inputStream, outputStream);
         }
     }
 
+
+    /**
+     * Gets the MIME-Type for a file.<p/>
+     * Fallback value is '* / *' (without spaces) <p/>
+     * Mostly copied together from: <a href="https://stackoverflow.com/q/8589645/17292289">StackOverflow</a>
+     */
+    @NonNull
+    public static String getMimeType(ContentResolver resolver, Uri uri) {
+        String type = null;
+        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+            type = resolver.getType(uri);
+            return type;
+        }
+
+        final String extension = MimeTypeMap.getFileExtensionFromUrl(uri.getPath());
+        if (extension != null) {
+            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase());
+        }
+        if (type == null) {
+            type = "*/*"; // fallback type.
+        }
+        return type;
+    }
+
     public static String getUrlForFile(Context context, File worldmap) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            String applicationId = context.getPackageName();
-            Uri uri = FileProvider.getUriForFile(context, applicationId + ".fileprovider", worldmap);
+            Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail.fileprovider", worldmap);//TODO: remove fixed fileprovider
             return uri.toString();
         } else {
             return "file://" + worldmap.getAbsolutePath();
         }
     }
 
+
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public static Intent getNewOpenDirectoryIntent() {
-        return new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        return intent;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -297,176 +169,4 @@ public final class AndroidStorage {
         intent.setType(Constants.SAVEGAME_FILE_MIME_TYPE);
         return intent;
     }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public static Intent getNewSelectZipIntent() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.addCategory(Intent.CATEGORY_OPENABLE);
-        intent.setType("application/zip");
-        return intent;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    public static void copyDocumentFilesFromToAsync(DocumentFile[] sources,
-                                                    Context context,
-                                                    DocumentFile[] targets,
-                                                    String loadingMessage,
-                                                    Consumer<Boolean> callback) {
-        if (sources.length != targets.length) {
-            throw new IllegalArgumentException("Both arrays, target & source have to have the same size");
-        }
-
-        BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
-
-        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
-        progressDialog.setOnCancelListener(dialog -> worker.cancel());
-
-        ContentResolver resolver = context.getContentResolver();
-        Handler handler = Handler.createAsync(Looper.getMainLooper());
-
-        worker.setTask(workerCallback -> {
-            try {
-                workerCallback.onInitialize();
-                for (int i = 0; i < sources.length; i++) {
-                    if (worker.isCancelled()) {
-                        workerCallback.onFailure(new CancellationException("Cancelled"));
-                        return;
-                    }
-                    DocumentFile source = sources[i];
-                    DocumentFile target = targets[i];
-
-                    if (source == null || target == null) {
-                        continue;
-                    }
-
-                    copyDocumentFile(source, resolver, target);
-                    float progress = i / (float) sources.length;
-                    workerCallback.onProgress(progress);
-                }
-                workerCallback.onComplete(true);
-            } catch (NullPointerException e) {
-                if (worker.isCancelled()) {
-                    workerCallback.onFailure(new CancellationException("Cancelled"));
-                    return;
-                }
-            } catch (Exception e) {
-                workerCallback.onFailure(e);
-            }
-        });
-        worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
-        worker.run();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    public static void copyDocumentFilesToDirAsync(DocumentFile[] files,
-                                                   Context context,
-                                                   DocumentFile targetDirectory,
-                                                   String loadingMessage,
-                                                   Consumer<Boolean> callback) {
-        BackgroundWorker<Boolean> worker = new BackgroundWorker<>();
-        CustomDialogFactory.CustomDialog progressDialog = getLoadingDialog(context, loadingMessage);
-        progressDialog.setOnCancelListener(dialog -> worker.cancel());
-        ContentResolver resolver = context.getContentResolver();
-        Handler handler = Handler.createAsync(Looper.getMainLooper());
-
-        worker.setTask(workerCallback -> {
-            try {
-                workerCallback.onInitialize();
-                for (int i = 0; i < files.length; i++) {
-                    if (worker.isCancelled()) {
-                        workerCallback.onFailure(new CancellationException("Cancelled"));
-                        return;
-                    }
-                    DocumentFile file = files[i];
-                    if (file == null) {
-                        continue;
-                    }
-
-                    copyDocumentFileToNewOrExistingFile(file, resolver, targetDirectory);
-                    float progress = i / (float) files.length;
-                    workerCallback.onProgress(progress);
-                }
-                workerCallback.onComplete(true);
-            } catch (NullPointerException e) {
-                if (worker.isCancelled()) {
-                    workerCallback.onFailure(new CancellationException("Cancelled"));
-                }
-            } catch (Exception e) {
-                workerCallback.onFailure(e);
-            }
-        });
-        worker.setCallback(getDefaultBackgroundWorkerCallback(handler, progressDialog, callback));
-        worker.run();
-    }
-
-    private static BackgroundWorkerCallback<Boolean> getDefaultBackgroundWorkerCallback(Handler handler,
-                                                                                        CustomDialogFactory.CustomDialog progressDialog,
-                                                                                        Consumer<Boolean> callback) {
-        return new BackgroundWorkerCallback<Boolean>() {
-            private int progress = -1;
-
-            @Override
-            public void onInitialize() {
-                handler.post(() -> {
-                    CustomDialogFactory.show(progressDialog);
-                });
-            }
-
-            @Override
-            public void onProgress(float progress) {
-                handler.post(() -> {
-                    int intProgress = (int) (progress * 100);
-                    if (this.progress == intProgress) {
-                        return;
-                    }
-
-                    this.progress = intProgress;
-
-                    if (progress == -1) {
-                        CustomDialogFactory.setDesc(progressDialog, null);
-                        return;
-                    }
-
-                    CustomDialogFactory.setDesc(progressDialog, intProgress + "%");
-                });
-            }
-
-            @RequiresApi(api = Build.VERSION_CODES.N)
-            @Override
-            public void onFailure(Exception e) {
-                this.onComplete(false);
-            }
-
-            @RequiresApi(api = Build.VERSION_CODES.N)
-            @Override
-            public void onComplete(Boolean result) {
-                handler.post(() -> {
-                    progressDialog.dismiss();
-                    callback.accept(result);
-                });
-            }
-        };
-    }
-
-    private static CustomDialogFactory.CustomDialog getLoadingDialog(Context context) {
-        return getLoadingDialog(context, null);
-    }
-
-    private static CustomDialogFactory.CustomDialog getLoadingDialog(Context context, String message) {
-        if (message == null) {
-            message = context.getResources().getString(R.string.dialog_loading_message);
-        }
-
-        CustomDialogFactory.CustomDialog dialog = CustomDialogFactory.createDialog(context,
-                                                                                   message,
-                                                                                   context.getResources()
-                                                                                           .getDrawable(R.drawable.loading_anim),
-                                                                                   null,
-                                                                                   null,
-                                                                                   true,
-                                                                                   false);
-        CustomDialogFactory.addCancelButton(dialog, android.R.string.no);
-        return dialog;
-    }
-
 }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/BackgroundWorker.java

@@ -1,46 +0,0 @@
-package com.gpl.rpg.AndorsTrail.util;
-
-import java.util.concurrent.Executors;
-
-public final class BackgroundWorker<T> {
-	boolean cancelled = false;
-	worker<T> task;
-	BackgroundWorkerCallback<T> callback;
-
-	public void setTask(worker<T> task) {
-		this.task = task;
-	}
-
-	public void setCallback(BackgroundWorkerCallback<T> callback) {
-		this.callback = callback;
-	}
-
-	public void cancel() {
-		cancelled = true;
-	}
-
-	interface worker<T> {
-		void doWork(BackgroundWorkerCallback<T> callback);
-	}
-
-	interface BackgroundWorkerCallback<T> {
-		void onInitialize();
-
-		default void onProgress(float progress) {
-		}
-
-		void onFailure(Exception e);
-
-		void onComplete(T result);
-	}
-
-	public void run() {
-		Executors.newSingleThreadExecutor().execute(() -> {
-			task.doWork(callback);
-		});
-	}
-
-	public boolean isCancelled() {
-		return cancelled;
-	}
-}

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java

@@ -1,8 +1,8 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface.OnDismissListener;
-import android.content.DialogInterface.OnCancelListener;
 import android.graphics.Rect;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
@@ -22,33 +22,25 @@ import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public class CustomDialogFactory {
-
-	public static class CustomDialog extends android.app.Dialog {
+	
+	public static class CustomDialog extends Dialog {
 		public CustomDialog(Context context) {
 			super(context);
 		}
-		boolean verticalButtons = false;
+		
 	}
-
-	public static CustomDialog createDialog(final Context context, String title, Drawable icon,
-											String desc, View content, boolean hasButtons, boolean canDismiss) {
-		return createDialog(context, title, icon, desc, content, hasButtons, canDismiss, false);
-	}
-
-	public static CustomDialog createDialog(final Context context, String title, Drawable icon,
-											String desc, View content, boolean hasButtons) {
+	
+	public static CustomDialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons) {
 		return createDialog(context, title, icon, desc, content, hasButtons, true);
 	}
-
-	public static CustomDialog createDialog(final Context context, String title, Drawable icon,
-											String desc, View content, boolean hasButtons,
-											final boolean canDismiss, final boolean verticalButtons) {
+		
+	public static CustomDialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons, final boolean canDismiss) {
 		final CustomDialog dialog = new CustomDialog(new ContextThemeWrapper(context, ThemeHelper.getDialogTheme())) {
 			@Override
 			public boolean onTouchEvent(MotionEvent event) {
 				Rect r = new Rect();
 				this.getWindow().getDecorView().findViewById(R.id.dialog_hitrect).getHitRect(r);
-
+				
 				if (r.contains((int)event.getX(), (int)event.getY())) {
 					return super.onTouchEvent(event);
 				} else {
@@ -59,7 +51,7 @@ public class CustomDialogFactory {
 					return false;
 				}
 			}
-
+			
 			@Override
 			public void onWindowFocusChanged(boolean hasFocus) {
 				super.onWindowFocusChanged(hasFocus);
@@ -71,8 +63,7 @@ public class CustomDialogFactory {
 				}
 			}
 		};
-		dialog.verticalButtons = verticalButtons;
-
+		
 		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		dialog.setContentView(R.layout.custom_dialog_title_icon);
 		dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
@@ -81,23 +72,20 @@ public class CustomDialogFactory {
 		} else {
 			dialog.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
-
+		
 		setTitle(dialog, title, icon);
-
+		
 		setDesc(dialog, desc);
-
+		
 		setContent(dialog, content);
-
-		ViewGroup buttonsHolder = getButtonContainer(dialog);
-		ViewGroup unusedButtonsHolder = getUnusedButtonContainer(dialog);
-
-		unusedButtonsHolder.setVisibility(View.GONE);
+		
+		ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
 		if (hasButtons) {
 			buttonsHolder.setVisibility(View.VISIBLE);
 		} else {
 			buttonsHolder.setVisibility(View.GONE);
 		}
-
+		
 		return dialog;
 	}
 
@@ -111,7 +99,7 @@ public class CustomDialogFactory {
 		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
 		return d;
 	}
-
+	
 	public static CustomDialog setTitle(final CustomDialog dialog, String title, Drawable icon) {
 		TextView titleView = (TextView) dialog.findViewById(R.id.dialog_title);
 		if (title != null || icon != null) {
@@ -123,7 +111,7 @@ public class CustomDialogFactory {
 		}
 		return dialog;
 	}
-
+	
 	public static CustomDialog setDesc(final CustomDialog dialog, String desc) {
 		TextView descView = (TextView) dialog.findViewById(R.id.dialog_description);
 		ViewGroup descHolder = (ViewGroup) dialog.findViewById(R.id.dialog_description_container);
@@ -136,7 +124,7 @@ public class CustomDialogFactory {
 		}
 		return dialog;
 	}
-
+	
 	public static CustomDialog setContent(final CustomDialog dialog, View content) {
 		ViewGroup contentHolder = (ViewGroup) dialog.findViewById(R.id.dialog_content_container);
 		if (content != null) {
@@ -147,101 +135,54 @@ public class CustomDialogFactory {
 		}
 		return dialog;
 	}
-
-	public static CustomDialog addButton(final CustomDialog dialog, String text, final OnClickListener listener) {
-		return addButton(dialog, -1, text, listener);
-	}
-	public static CustomDialog addButton(final CustomDialog dialog, int textId, final OnClickListener listener) {
-		return addButton(dialog, textId, null, listener);
-	}
-	public static CustomDialog addButton(final CustomDialog dialog, int textId, String text, final OnClickListener listener) {
-		Button template = getButtonTemplate(dialog);
+	
+	public static Dialog addButton(final Dialog dialog, int textId, final OnClickListener listener) {
+		
+		Button template = (Button) dialog.findViewById(R.id.dialog_template_button);
 		LayoutParams params = template.getLayoutParams();
-		ViewGroup buttonsHolder = getButtonContainer(dialog);
-
+		ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
+		
 		Button b = new Button(dialog.getContext());
 		b.setLayoutParams(params);
 		//Old android versions need this "reminder"
 		b.setBackgroundDrawable(ThemeHelper.getThemeDrawable(dialog.getContext(), R.attr.ui_theme_textbutton_drawable));
 		b.setTextColor(ThemeHelper.getThemeColor(dialog.getContext(), R.attr.ui_theme_dialogue_light_color));
-
-		if(textId != -1) {
-			b.setText(textId);
-		} else {
-			b.setText(text);
-		}
-
+		
+		b.setText(textId);
 		b.setOnClickListener(new OnClickListener() {
-
+			
 			@Override
 			public void onClick(View v) {
 				listener.onClick(v);
 				dialog.dismiss();
 			}
 		});
-
+		
 		buttonsHolder.addView(b, params);
 		return dialog;
 	}
-
-	public static CustomDialog addDismissButton(final CustomDialog dialog, int textId) {
+	
+	public static Dialog addDismissButton(final Dialog dialog, int textId) {
 		return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
-
+			
 			@Override
 			public void onClick(View v) {
 				dialog.dismiss();
 			}
 		});
 	}
-	public static CustomDialog addCancelButton(final CustomDialog dialog, int textId) {
-		return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				dialog.cancel();
-			}
-		});
-	}
-
-	public static CustomDialog setDismissListener(CustomDialog dialog, OnDismissListener listener) {
+	
+	public static Dialog setDismissListener(Dialog dialog, OnDismissListener listener) {
 		dialog.setOnDismissListener(listener);
-
+		
 		return dialog;
 	}
-
-	public static CustomDialog setCancelListener(CustomDialog dialog, OnCancelListener listener) {
-		dialog.setOnCancelListener(listener);
-		return dialog;
-	}
-
-	public static void show(CustomDialog dialog) {
-
+	
+	public static void show(Dialog dialog) {
+		
 		dialog.findViewById(R.id.dialog_template_button).setVisibility(View.GONE);
-		dialog.findViewById(R.id.dialog_template_button_vertical).setVisibility(View.GONE);
 		dialog.show();
-
-	}
-
-
-	private static ViewGroup getUnusedButtonContainer(CustomDialog dialog) {
-		if (dialog.verticalButtons)
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
-		else
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container_vertical);
-	}
-
-	private static ViewGroup getButtonContainer(CustomDialog dialog) {
-		if (dialog.verticalButtons)
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container_vertical);
-		else
-			return (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
-	}
-
-	private static Button getButtonTemplate(CustomDialog dialog) {
-		if (dialog.verticalButtons)
-			return (Button) dialog.findViewById(R.id.dialog_template_button_vertical);
-		else
-			return (Button) dialog.findViewById(R.id.dialog_template_button);
+		
 	}
 
 }

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/SpinnerEmulator.java

@@ -9,15 +9,13 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
 
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
-
 /**
  * Simply instantiate this class, implement abstract methods in an anonymous type, and tada, your Button is a Spinner! 
  */
 public abstract class SpinnerEmulator {
 	
 	private Button spinnerButton;
-	private CustomDialog spinnerDialog = null;
+	private Dialog spinnerDialog = null;
 	private ListView choicesList;
 	private Context context;