feygard_1 with hash bug

This reverts commit 718886ba3a.

.gitignore

@@ -0,0 +1 @@
+/AndorsTrail/.idea/workspace.xml

AndorsTrail/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

AndorsTrail/.idea/gradle.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

AndorsTrail/.idea/jarRepositories.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-  </component>
-</project>

AndorsTrail/.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

AndorsTrail/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

AndorsTrail/.idea/workspace.xml

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="fb7bf33b-30cf-40b9-a238-3e2f6f604a8f" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\chris\.android\avd\Nexus_5_API_30.avd]" />
-  <component name="ExternalProjectsData">
-    <projectState path="$PROJECT_DIR$">
-      <ProjectState />
-    </projectState>
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view>
-          <tree_state>
-            <expand>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="AndorsTrail" type="f1a62948:ProjectNode" />
-              </path>
-            </expand>
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="C:\AT\sec\AndorsTrail.keystore" />
-    <option name="KEY_ALIAS" value="andorstrail" />
-    <option name="REMEMBER_PASSWORDS" value="true" />
-    <option name="BUILD_TARGET_KEY" value="apk" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ProjectId" id="2FG0LqADbxm6Q1t3yQ9BlX5APzJ" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="ApkExportedModule" value="AndorsTrail.app" />
-    <property name="ExportApk.ApkPath" value="C:\AT\AndorsTrailRelease\andors-trail\AndorsTrail\app" />
-    <property name="ExportApk.BuildVariants" value="release" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
-    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
-    <property name="cidr.known.project.marker" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../sec/AndorsTrail.keystore" />
-    <property name="settings.editor.selected.configurable" value="device.file.explorer" />
-    <property name="show.inlinked.gradle.project.popup" value="false" />
-  </component>
-  <component name="RunManager">
-    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-    </configuration>
-    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-      <module name="AndorsTrail.app" />
-      <option name="DEPLOY" value="true" />
-      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-      <option name="DEPLOY_AS_INSTANT" value="false" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ALL_USERS" value="false" />
-      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
-      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-      <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
-      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-      <option name="DEBUGGER_TYPE" value="Auto" />
-      <Auto>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      </Auto>
-      <Hybrid>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      </Hybrid>
-      <Java />
-      <Native>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      </Native>
-      <Profilers>
-        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
-        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="TEST_OBJECT" value="class" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="TestNG">
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <properties />
-      <listeners />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="fb7bf33b-30cf-40b9-a238-3e2f6f604a8f" name="Changes" comment="" />
-      <created>1664103080085</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1664103080085</updated>
-    </task>
-    <servers />
-  </component>
-</project>

AndorsTrail/app/build.gradle

@@ -1,23 +1,52 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
 
     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'
+        }
     }
 }
 
 dependencies {
     implementation 'com.android.support:support-v4:28.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}/src/main/res"
+    rename "(.*)\\.tmx", "\$1.xml"
+}
+
+task copyTranslation(type: Copy) {
+    description("Copies the translation files to the modules translations folder")
+    from "${rootDir}/assets/translation"
+    into "${projectDir}/src/main/assets/translation"
+}
+
+task cleanup(type: Delete) {
+    description("Deletes the assets/translation and the res folder from the modules folder")
+    delete "${projectDir}/src/main/res", "${projectDir}/src/main/assets/translation"
+}
+
+afterEvaluate {
+    preBuild.dependsOn project.tasks.copyRes
+    preBuild.dependsOn project.tasks.copyTranslation
+    clean.dependsOn project.tasks.cleanup
+}

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -3,15 +3,11 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="66"
-	android:versionName="0.8.2"
+	android:versionCode="73"
+	android:versionName="0.8.7"
 	android:installLocation="auto"
 	>
-	<uses-sdk 
-		android:minSdkVersion="4"
-		android:targetSdkVersion="30"
-		/>
-	
+
 	<supports-screens
 		android:smallScreens="true" 
 		android:normalScreens="true"
@@ -25,9 +21,9 @@
 
 
 	<application 
-		android:name=".AndorsTrailApplication"
+		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
 		android:label="@string/app_name" 
-		android:icon="@drawable/icon"
+		android:icon="@drawable/${icon_name}"
 		android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AndorsTrailTheme_Blue"
@@ -36,37 +32,39 @@
 		android:preserveLegacyExternalStorage="true"
 		>
 		<activity 
-		    android:name=".activity.StartScreenActivity"
-		    android:clearTaskOnLaunch="true">
+		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
+			android:exported="true"
+		    android:clearTaskOnLaunch="true"
+		    >
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
    		<activity 
-			android:name=".activity.MainActivity"
+			android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
 			android:label="@string/app_name" 
 			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
-		<activity android:name=".activity.HeroinfoActivity" />
-		<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ShopActivity" />
-		<activity android:name=".activity.AboutActivity" />
-		<activity android:name=".activity.LoadingActivity" />
-		<activity android:name=".activity.Preferences" />
-		<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.DisplayWorldMapActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ShopActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.AboutActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadingActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.Preferences" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
 
         <provider
         android:name="android.support.v4.content.FileProvider"
-        android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
+        android:authorities="${applicationId}.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 = false;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	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 DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final String CURRENT_VERSION_DISPLAY = "0.8.7";
 	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 : 66;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 73;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

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

@@ -2,7 +2,6 @@ package com.gpl.rpg.AndorsTrail;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.net.Uri;
 import android.preference.PreferenceManager;
 
 public final class AndorsTrailPreferences {
@@ -62,8 +61,6 @@ public final class AndorsTrailPreferences {
 	public boolean showQuickslotsWhenToolboxIsVisible = false;
 	public String language = "default";
 
-	public Uri exportImportFolderPath;
-
 	public int selectedTheme = 0;
 
 	public void read(final Context androidContext) {
@@ -81,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", true);
+			dest.highQualityFilters = prefs.getBoolean("high_quality_filters", false);
 			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

@@ -46,14 +46,15 @@ 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(Dialog d, final ControllerContext context) {
+	private static void showDialogAndPause(CustomDialog d, final ControllerContext context) {
 		showDialogAndPause(d, context, null);
 	}
-	private static void showDialogAndPause(Dialog d, final ControllerContext context, final OnDismissListener onDismiss) {
+	private static void showDialogAndPause(CustomDialog d, final ControllerContext context, final OnDismissListener onDismiss) {
 		context.gameRoundController.pause();
 		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
 			@Override
@@ -195,7 +196,7 @@ public final class Dialogs {
 		//		itemList.setPadding(20, 0, 20, 20);
 		itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
 
-		final Dialog d = CustomDialogFactory.createDialog(mainActivity, 
+		final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
 				mainActivity.getResources().getString(title), 
 				mainActivity.getResources().getDrawable(R.drawable.ui_icon_equipment), 
 				msg, 
@@ -249,7 +250,7 @@ public final class Dialogs {
 	}
 
 	public static void showHeroDied(final MainActivity mainActivity, final ControllerContext controllers) {
-		final Dialog d = CustomDialogFactory.createDialog(mainActivity,
+		final CustomDialog 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),
@@ -286,7 +287,7 @@ public final class Dialogs {
 	}
 
 	public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
-		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
+		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
 				currentActivity.getResources().getString(R.string.dialog_rest_title), 
 				null, 
 				currentActivity.getResources().getString(R.string.dialog_rest_confirm_message), 
@@ -310,7 +311,7 @@ public final class Dialogs {
 		//		.setMessage(R.string.dialog_rest_message)
 		//		.setNeutralButton(android.R.string.ok, null)
 		//		.create();
-		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
+		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
 				currentActivity.getResources().getString(R.string.dialog_rest_title), 
 				null, 
 				currentActivity.getResources().getString(R.string.dialog_rest_message), 
@@ -336,7 +337,7 @@ public final class Dialogs {
 			text += currentActivity.getResources().getString(R.string.dialog_newversion_permission_information);
 		}
 
-		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
+		final CustomDialog d = CustomDialogFactory.createDialog(currentActivity,
 				currentActivity.getResources().getString(R.string.dialog_newversion_title), 
 				null, 
 				text,
@@ -371,7 +372,7 @@ public final class Dialogs {
 		}
 
 		if (!world.model.statistics.hasUnlimitedSaves()) {
-			final Dialog d = CustomDialogFactory.createDialog(mainActivity,
+			final CustomDialog d = CustomDialogFactory.createDialog(mainActivity,
 					mainActivity.getResources().getString(R.string.menu_save_switch_character_title),
 					null,
 					mainActivity.getResources().getString(R.string.menu_save_switch_character),
@@ -460,7 +461,7 @@ public final class Dialogs {
 		itemList.setAdapter(new ArrayAdapter<String>(context, R.layout.combatlog_row, android.R.id.text1, combatLogMessages));
 		view = itemList;
 
-		final Dialog d = CustomDialogFactory.createDialog(context, 
+		final CustomDialog 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/BulkSelectionInterface.java

@@ -23,6 +23,7 @@ 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
@@ -206,7 +207,7 @@ public final class BulkSelectionInterface extends AndorsTrailBaseActivity implem
 //									})
 //						.setNegativeButton(android.R.string.no, null)
 //						.show();
-					final Dialog d = CustomDialogFactory.createDialog(v.getContext(),
+					final CustomDialog 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/LoadSaveActivity.java

@@ -1,16 +1,17 @@
 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;
@@ -40,6 +41,7 @@ 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;
@@ -95,9 +97,7 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         importSaves.setTag(SLOT_NUMBER_IMPORT_SAVEGAMES);
         importWorldmap.setTag(SLOT_NUMBER_IMPORT_WORLDMAP);
 
-        ViewGroup exportContainer = (ViewGroup) findViewById(R.id.loadsave_export_save_container);
-        ViewGroup importContainer = (ViewGroup) findViewById(R.id.loadsave_import_save_container);
-        ViewGroup importWorldmapContainer = (ViewGroup) findViewById(R.id.loadsave_import_worldmap_container);
+        ViewGroup exportImportContainer = (ViewGroup) findViewById(R.id.loadsave_export_import_save_container);
 
 
         addSavegameSlotButtons(slotList, params, Savegames.getUsedSavegameSlots(this));
@@ -108,19 +108,20 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
             createNewSlot.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
             createNewSlot.setOnClickListener(this);
             newSlotContainer.setVisibility(View.VISIBLE);
-            exportContainer.setVisibility(View.GONE);
-            importContainer.setVisibility(View.GONE);
-            importWorldmapContainer.setVisibility(View.GONE);
+            exportImportContainer.setVisibility(View.GONE);
         } else {
             newSlotContainer.setVisibility(View.GONE);
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 exportSaves.setOnClickListener(this);
                 importSaves.setOnClickListener(this);
                 importWorldmap.setOnClickListener(this);
-                exportContainer.setVisibility(View.VISIBLE);
-                importContainer.setVisibility(View.VISIBLE);
-                importWorldmapContainer.setVisibility(View.VISIBLE);
+                exportImportContainer.setVisibility(View.VISIBLE);
+
+                boolean hasSavegames = !Savegames.getUsedSavegameSlots(this).isEmpty();
+                exportSaves.setEnabled(hasSavegames);
+            } else {
+                exportImportContainer.setVisibility(View.GONE);
             }
         }
     }
@@ -128,14 +129,18 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
     private static final int READ_EXTERNAL_STORAGE_REQUEST = 1;
     private static final int WRITE_EXTERNAL_STORAGE_REQUEST = 2;
 
-    @TargetApi(23)
     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);
             }
         }
     }
@@ -149,11 +154,15 @@ 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);
@@ -177,41 +186,76 @@ 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) {
-            List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
-            if (usedSlots.isEmpty())
-                slot = SLOT_NUMBER_FIRST_SLOT;
-            else slot = Collections.max(usedSlots) + 1;
+            slot = getFirstFreeSlot();
         } 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);
-        } else if (slot < SLOT_NUMBER_FIRST_SLOT)
+
+            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) {
             slot = SLOT_NUMBER_FIRST_SLOT;
+        }
 
         i.putExtra("slot", slot);
-        setResult(Activity.RESULT_OK, i);
+        if (success) {
+            setResult(Activity.RESULT_OK, i);
+        } else {
+            setResult(Activity.RESULT_CANCELED, 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) {
@@ -220,10 +264,14 @@ 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);
     }
@@ -232,7 +280,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.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             switch (slot) {
                 case SLOT_NUMBER_IMPORT_WORLDMAP:
                     clickImportWorldmap();
@@ -246,8 +294,9 @@ 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);
             }
@@ -261,7 +310,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);
         }
@@ -269,8 +318,11 @@ 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 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.");
+        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.");
             CustomDialogFactory.show(d);
             return true;
         }
@@ -279,27 +331,32 @@ 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);
-        DocumentFile source = DocumentFile.fromFile(storageDir);
+        File storageDir = AndroidStorage.getStorageDirectory(context,
+                                                             Constants.FILENAME_SAVEGAME_DIRECTORY);
         DocumentFile target = DocumentFile.fromTreeUri(context, uri);
         if (target == null) {
             return;
         }
 
-        DocumentFile[] files = source.listFiles();
+        File[] files = storageDir.listFiles();
+        if (files == null) {
+            showErrorExportingSaveGamesUnknown();
+            return;
+        }
 
         boolean hasExistingFiles = false;
-        for (DocumentFile file :
-                files) {
+        for (File file : files) {
             String fileName = file.getName();
-            if (fileName == null)
-                continue;
 
             DocumentFile existingFile = target.findFile(fileName);
             if (existingFile != null) {
@@ -311,52 +368,70 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         if (hasExistingFiles) {
             showConfirmOverwriteByExportQuestion(resolver, target, files);
         } else {
-            exportSaveGamesFolderContentToFolder(resolver, target, files);
+            exportSaveGamesFolderContentToFolder(target, files);
         }
     }
 
-    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();
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void exportSaveGamesFolderContentToFolder(DocumentFile target, File[] files) {
+        DocumentFile[] sourceFiles = new DocumentFile[files.length];
 
+        File[] worldmapFiles = null;
+
+        for (int i = 0; i < files.length; i++) {
+            File file = files[i];
             if (file.isFile()) {
-                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();
-                    }
-                }
+                sourceFiles[i] = DocumentFile.fromFile(file);
+            } else if (file.isDirectory() && Objects.equals(file.getName(),
+                                                            Constants.FILENAME_WORLDMAP_DIRECTORY)) {
+                worldmapFiles = file.listFiles();
             }
         }
+        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.JELLY_BEAN)
+    @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)
     private void importSaveGames(Intent data) {
         Uri uri = data.getData();
         ClipData uris = data.getClipData();
@@ -367,7 +442,8 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
 
         Context context = getApplicationContext();
-        ContentResolver resolver = context.getContentResolver();
+        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
+                .getContentResolver();
 
         File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
         DocumentFile appSavegameFolder = DocumentFile.fromFile(storageDir);
@@ -376,13 +452,18 @@ 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);
     }
 
-    private void importSaveGamesFromUris(Context context, ContentResolver resolver, DocumentFile appSavegameFolder, List<Uri> uriList) {
+    @RequiresApi(api = Build.VERSION_CODES.P)
+    private void importSaveGamesFromUris(Context context,
+                                         ContentResolver resolver,
+                                         DocumentFile appSavegameFolder,
+                                         List<Uri> uriList) {
         int count = uriList.size();
 
         ArrayList<DocumentFile> alreadyExistingFiles = new ArrayList<>();
@@ -392,10 +473,11 @@ 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) {
@@ -405,24 +487,51 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
         }
     }
 
-    private void importSaveGames(ContentResolver resolver, DocumentFile appSavegameFolder, List<DocumentFile> saveFiles) {
-        for (DocumentFile file : saveFiles) {
+    @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;
+            }
+
             int slot = getSlotFromSavegameFileName(file.getName());
-            importSaveGameFile(resolver, appSavegameFolder, file, slot);
-        }
-    }
+            if (slot == -1) {
+                //invalid file name
+                continue;
+            }
 
+            if (saveAsNew) {
+                slot = getFirstFreeSlot();
+                saveAsNew = false;
+            }
 
-    private void completeSavegameImportAndCheckIfDone(List<Integer> importsNeedingConfirmation, int slot) {
-        importsNeedingConfirmation.remove((Object) slot);
-        if (importsNeedingConfirmation.isEmpty()) {
-            completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES);
+            String targetName = Savegames.getSlotFileName(slot);
+            sources[i] = file;
+            targets[i] = getOrCreateDocumentFile(appSavegameFolder, targetName);
         }
+
+        AndroidStorage.copyDocumentFilesFromToAsync(sources,
+                                                    this,
+                                                    targets,
+                                                    getString(R.string.loadsave_importing_savegames),
+                                                    (sucess) -> completeLoadSaveActivity(
+                                                            SLOT_NUMBER_IMPORT_SAVEGAMES,
+                                                            sucess));
     }
 
     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();
@@ -430,7 +539,6 @@ 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());
@@ -440,116 +548,110 @@ 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 = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this).getContentResolver();
+        Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
 
-        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-        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()) {
+        DocumentFile chosenZip = DocumentFile.fromSingleUri(context, uri);
+        if (chosenZip == null || !chosenZip.isFile()) {
             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;
+        String chosenZipName = chosenZip.getName();
+        if (!chosenZipName.startsWith(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
+            showErrorImportingWorldmapWrongDirectory();
+            return;
         }
 
-        DocumentFile[] files = chosenFolder.listFiles();
-        for (DocumentFile file : files) {
-            if (file.isFile()) {
-                try {
-                    AndroidStorage.copyDocumentFileToNewOrExistingFile(file, resolver, ownWorldmapFolder);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
+        File ownWorldmapFolder = getOwnWorldmapFolder(context);
 
-        completeLoadSaveActivity(SLOT_NUMBER_IMPORT_WORLDMAP);
+
+        AndroidStorage.unzipDocumentFileToDirectoryAsync(chosenZip,
+                                                         this,
+                                                         ownWorldmapFolder,
+                                                         false,
+                                                         getString(R.string.loadsave_importing_worldmap),
+                                                         (success) -> completeLoadSaveActivity(
+                                                                 SLOT_NUMBER_IMPORT_WORLDMAP,
+                                                                 success));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    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;
+            }
+        }
+        if (ownWorldmapFolder == null) {
+            ownWorldmapFolder = new File(storageDir, Constants.FILENAME_WORLDMAP_DIRECTORY);
+            ownWorldmapFolder.mkdir();
+        }
+        return ownWorldmapFolder;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void clickExportSaveGames() {
-        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_EXPORT_SAVEGAMES);
+        showStartExportInfo(view -> startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(),
+                                                           -SLOT_NUMBER_EXPORT_SAVEGAMES));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void clickImportSaveGames() {
-        startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(), -SLOT_NUMBER_IMPORT_SAVEGAMES);
-
+        showStartImportSavesInfo(view -> startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(),
+                                                                -SLOT_NUMBER_IMPORT_SAVEGAMES));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @RequiresApi(api = Build.VERSION_CODES.P)
     private void clickImportWorldmap() {
-        startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(), -SLOT_NUMBER_IMPORT_WORLDMAP);
+        showStartImportWorldmapInfo(view -> startActivityForResult(AndroidStorage.getNewSelectZipIntent(),
+                                                                   -SLOT_NUMBER_IMPORT_WORLDMAP));
 
     }
 
-    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);
+    @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);
 
-        CustomDialogFactory.addButton(d, android.R.string.yes, v -> exportSaveGamesFolderContentToFolder(resolver, targetFolder, files));
+        CustomDialogFactory.addButton(d,
+                                      android.R.string.yes,
+                                      v -> exportSaveGamesFolderContentToFolder(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_overwrite_confirmation);
+        String message = getString(R.string.loadsave_import_file_exists_question);
 
         StringBuilder sb = new StringBuilder();
         sb.append('\n');
@@ -557,48 +659,96 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
         Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
 
-        for (int i = 0; i < amount && i < 3; i++) {
+        ArrayList<CustomDialog> dialogs = new ArrayList<>(amount);
+
+        for (int i = 0; i < amount; i++) {
             DocumentFile alreadyExistingFile = alreadyExistingFiles.get(i);
-            String alreadyExistingFileName = alreadyExistingFile.getName();
-            FileHeader fileHeader = Savegames.quickload(context, getSlotFromSavegameFileName(alreadyExistingFileName));
-            sb.append('\n');
-            String fileHeaderDesription = "";
-            if (fileHeader != null)
-                fileHeaderDesription = fileHeader.describe();
+            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;
+            }
 
-            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);
+            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));
 
-        CustomDialogFactory.addButton(d, android.R.string.yes, v -> newFiles.addAll(alreadyExistingFiles));
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.setDismissListener(d, dialog -> {
+
+            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);
+        }
+
+        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 {
             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;
+        }
 
-//        Uri uri = data.getData();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             switch (-requestCode) {
                 case SLOT_NUMBER_EXPORT_SAVEGAMES:
                     exportSaveGames(data);
@@ -631,48 +781,90 @@ public final class LoadSaveActivity extends AndorsTrailBaseActivity implements O
 
     //region show Dialogs
 
-    private void showErrorImportingWorldmapWrongDirectory() {
-        final Dialog d = CustomDialogFactory.createErrorDialog(this,
-                getString(R.string.loadsave_import_worldmap_unsuccessfull),
-                getString(R.string.loadsave_import_worldmap_unsuccessfull_wrong_directory));
+    //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);
     }
 
-    private void showErrorImportingSaveGameUnknown() {
-        final Dialog d = CustomDialogFactory.createErrorDialog(this,
-                getString(R.string.loadsave_import_save_unsuccessfull),
-                getString(R.string.loadsave_import_save_unsuccessfull_unknown));
+    @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));
+        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));
+        CustomDialogFactory.show(d);
+    }
+
+    //endregion
+
     private void showErrorLoadingEmptySlot() {
-        final Dialog d = CustomDialogFactory.createErrorDialog(this,
-                getString(R.string.startscreen_error_loading_game),
-                getString(R.string.startscreen_error_loading_empty_slot));
+        final CustomDialog 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 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);
+        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);
         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 Dialog 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 CustomDialog 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,11 +20,12 @@ 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 Dialog progressDialog;
+	private CustomDialog progressDialog;
 	private CloudsAnimatorView clouds_back, clouds_mid, clouds_front;
 	boolean loaded = false;
 
@@ -165,7 +166,7 @@ public final class LoadingActivity extends AndorsTrailBaseActivity implements On
 	}
 
 	private void showLoadingFailedDialog(int messageResourceID) {
-		final Dialog d = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_failed_title), null, getResources().getString(messageResourceID), null, true);
+		final CustomDialog 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,6 +43,7 @@ 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;
@@ -247,7 +248,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 Dialog d = CustomDialogFactory.createDialog(v.getContext(), 
+					final CustomDialog 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/Preferences.java

@@ -1,14 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -39,7 +32,5 @@ public final class Preferences extends PreferenceActivity {
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		app.setLocale(this);
 	}
-
-
 }
 

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

@@ -11,6 +11,7 @@ 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;
@@ -114,7 +115,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 Dialog d = CustomDialogFactory.createDialog(this,
+			final CustomDialog 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/StartScreenActivity_MainMenu.java

@@ -28,10 +28,8 @@ import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.WorldSetup;
 import com.gpl.rpg.AndorsTrail.activity.AboutActivity;
-import com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity;
 import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
 import com.gpl.rpg.AndorsTrail.activity.Preferences;
-import com.gpl.rpg.AndorsTrail.activity.StartScreenActivity;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
@@ -40,20 +38,17 @@ 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 {
 
     private static final int INTENTREQUEST_PREFERENCES = 7;
     public static final int INTENTREQUEST_LOADGAME = 9;
-    public static final int INTENTREQUEST_EXPORT_SAVE = 11;
-    public static final int INTENTREQUEST_IMPORT_SAVE = 13;
 
     private boolean hasExistingGame = false;
     private Button startscreen_continue;
     private Button startscreen_newgame;
     private Button startscreen_load;
-    private Button startscreen_import;
-    private Button startscreen_export;
     private ViewGroup save_preview_holder;
     private ImageView save_preview_hero_icon;
     private TextView save_preview_hero_desc;
@@ -65,231 +60,224 @@ public class StartScreenActivity_MainMenu extends Fragment {
         super.onCreateView(inflater, container, savedInstanceState);
 
 
-        if (container != null) {
-            container.removeAllViews();
-        }
+		if (container != null) {
+			container.removeAllViews();
+		}
+		
+		View root = inflater.inflate(R.layout.startscreen_mainmenu, container, false);
 
-        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);
+		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() {
-            @Override
-            public void onClick(View arg0) {
-                continueGame(false, Savegames.SLOT_QUICKSAVE, null);
-            }
-        });
+		startscreen_continue = (Button) root.findViewById(R.id.startscreen_continue);
+		startscreen_continue.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				continueGame(false, Savegames.SLOT_QUICKSAVE, null);
+			}
+		});
 
-        startscreen_newgame = (Button) root.findViewById(R.id.startscreen_newgame);
-        startscreen_newgame.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                if (hasExistingGame) {
-                    comfirmNewGame();
-                } else {
-                    createNewGame();
-                }
-            }
-        });
+		startscreen_newgame = (Button) root.findViewById(R.id.startscreen_newgame);
+		startscreen_newgame.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				if (hasExistingGame) {
+					comfirmNewGame();
+				} else {
+					createNewGame();
+				}
+			}
+		});
 
-        Button b = (Button) root.findViewById(R.id.startscreen_about);
-        b.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                startActivity(new Intent(getActivity(), AboutActivity.class));
-            }
-        });
+		Button b = (Button) root.findViewById(R.id.startscreen_about);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				startActivity(new Intent(getActivity(), AboutActivity.class));
+			}
+		});
 
-        b = (Button) root.findViewById(R.id.startscreen_preferences);
-        b.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                Intent intent = new Intent(getActivity(), Preferences.class);
-                StartScreenActivity_MainMenu.this.startActivityForResult(intent, INTENTREQUEST_PREFERENCES);
-            }
-        });
+		b = (Button) root.findViewById(R.id.startscreen_preferences);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				Intent intent = new Intent(getActivity(), Preferences.class);
+				StartScreenActivity_MainMenu.this.startActivityForResult(intent, INTENTREQUEST_PREFERENCES);
+			}
+		});
 
-        startscreen_load = (Button) root.findViewById(R.id.startscreen_load);
-        startscreen_load.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                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 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),
-                            null,
-                            true);
-                    CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Dialogs.showLoad(StartScreenActivity_MainMenu.this);
-                        }
-                    });
-                    CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
-                    CustomDialogFactory.show(d);
+		startscreen_load = (Button) root.findViewById(R.id.startscreen_load);
+		startscreen_load.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				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(),
+							getString(R.string.startscreen_load_game),
+							getResources().getDrawable(android.R.drawable.ic_delete),
+							getString(R.string.startscreen_load_game_confirm),
+							null,
+							true);
+					CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							Dialogs.showLoad(StartScreenActivity_MainMenu.this);
+						}
+					});
+					CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
+					CustomDialogFactory.show(d);
 
-                } else {
-                    Dialogs.showLoad(StartScreenActivity_MainMenu.this);
-                }
-            }
-        });
+				} else {
+					Dialogs.showLoad(StartScreenActivity_MainMenu.this);
+				}
+			}
+		});
 
-        if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
-            if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
-                continueGame(true, 0, "Debug player");
-            } else {
-                continueGame(true, 0, "Player");
-            }
-        } else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
-            continueGame(false, Savegames.SLOT_QUICKSAVE, null);
-        }
 
-        // if it is a new version we first fire a welcome screen in onResume
-        // and afterwards check the permissions
-        if (!isNewVersion()) {
-            checkAndRequestPermissions(getActivity());
-            migrateDataOnDemand(getActivity());
-        }
+		if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
+			if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
+				continueGame(true, 0, "Debug player");
+			} else {
+				continueGame(true, 0, "Player");
+			}
+		} else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
+			continueGame(false, Savegames.SLOT_QUICKSAVE, null);
+		}
 
-        return root;
-    }
+		// if it is a new version we first fire a welcome screen in onResume
+		// and afterwards check the permissions
+		if (!isNewVersion()) {
+			checkAndRequestPermissions(getActivity());
+			migrateDataOnDemand(getActivity());
+		}
 
-    @Override
-    public void onResume() {
-        super.onResume();
+		return root;
+	}
 
-        String playerName;
-        String displayInfo = null;
-        int iconID = TileManager.CHAR_HERO;
-        boolean isDead = false;
+	@Override
+	public void onResume() {
+		super.onResume();
 
-        FileHeader header = Savegames.quickload(getActivity(), Savegames.SLOT_QUICKSAVE);
-        if (header != null && header.playerName != null) {
-            playerName = header.playerName;
-            displayInfo = header.displayInfo;
-            iconID = header.iconID;
-            isDead = header.isDead;
-        } else {
-            // Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences
-            SharedPreferences p = getActivity().getSharedPreferences("quicksave", Activity.MODE_PRIVATE);
-            playerName = p.getString("playername", null);
-            if (playerName != null) {
-                displayInfo = "level " + p.getInt("level", -1);
-            }
-        }
-        hasExistingGame = (playerName != null);
-        setButtonState(playerName, displayInfo, iconID, isDead);
+		String playerName;
+		String displayInfo = null;
+		int iconID = TileManager.CHAR_HERO;
+		boolean isDead = false;
 
-        if (isNewVersion()) {
-            Dialogs.showNewVersion(getActivity(), new DialogInterface.OnDismissListener() {
-                @Override
-                public void onDismiss(DialogInterface arg0) {
-                    setCurrentVersionForVersionCheck();
-                    checkAndRequestPermissions(getActivity());
-                    migrateDataOnDemand(getActivity());
-                    startscreen_load.setEnabled(true);
-                }
-            });
-        }
+		FileHeader header = Savegames.quickload(getActivity(), Savegames.SLOT_QUICKSAVE);
+		if (header != null && header.playerName != null) {
+			playerName = header.playerName;
+			displayInfo = header.displayInfo;
+			iconID = header.iconID;
+			isDead = header.isDead;
+		} else {
+			// Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences
+			SharedPreferences p = getActivity().getSharedPreferences("quicksave", Activity.MODE_PRIVATE);
+			playerName = p.getString("playername", null);
+			if (playerName != null) {
+				displayInfo = "level " + p.getInt("level", -1);
+			}
+		}
+		hasExistingGame = (playerName != null);
+		setButtonState(playerName, displayInfo, iconID, isDead);
 
-        startscreen_load.setEnabled(true);
-    }
+		if (isNewVersion()) {
+			Dialogs.showNewVersion(getActivity(), new DialogInterface.OnDismissListener() {
+				@Override
+				public void onDismiss(DialogInterface arg0) {
+					setCurrentVersionForVersionCheck();
+					checkAndRequestPermissions(getActivity());
+					migrateDataOnDemand(getActivity());
+				}
+			});
+		}
 
-    @TargetApi(29)
-    public void migrateDataOnDemand(final Activity activity) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
-                if (AndroidStorage.shouldMigrateToInternalStorage(activity.getApplicationContext())) {
-                    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) {
-                            startscreen_load.setEnabled(true);
-                        }
-                    });
-                    CustomDialogFactory.show(d);
-                    if (!AndroidStorage.migrateToInternalStorage(activity.getApplicationContext())) {
-                        final Dialog errorDlg = CustomDialogFactory.createDialog(activity,
-                                getString(R.string.startscreen_migration_title),
-                                activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                getString(R.string.startscreen_migration_failure),
-                                null,
-                                true);
-                        CustomDialogFactory.addDismissButton(errorDlg, android.R.string.ok);
-                        d.cancel();
-                        CustomDialogFactory.show(errorDlg);
-                    }
-                } else {
-                    L.log("INFO: No external files or destination folder ist not empty. No data migration.");
-                }
-            } else {
-                L.log("INFO: No read permission on external folder. No data migration.");
-            }
-        }
-    }
+	}
 
-    private static final int READ_EXTERNAL_STORAGE_REQUEST = 1;
-    private static final int WRITE_EXTERNAL_STORAGE_REQUEST = 2;
+	@TargetApi(29)
+	public void migrateDataOnDemand(final Activity activity) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+				if (AndroidStorage.shouldMigrateToInternalStorage(activity.getApplicationContext())) {
+					final CustomDialog 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);
+					CustomDialogFactory.show(d);
+					if (!AndroidStorage.migrateToInternalStorage(activity.getApplicationContext())) {
+						final CustomDialog 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),
+								null,
+								true);
+						CustomDialogFactory.addDismissButton(errorDlg, android.R.string.ok);
+						d.cancel();
+						CustomDialogFactory.show(errorDlg);
+					}
+				} else {
+					L.log("INFO: No external files or destination folder ist not empty. No data migration.");
+				}
+			} else {
+				L.log("INFO: No read permission on external folder. No data migration.");
+			}
+		}
+	}
 
-    @TargetApi(23)
-    public static void checkAndRequestPermissions(final Activity activity) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
-            if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                activity.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, READ_EXTERNAL_STORAGE_REQUEST);
-            }
-            if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                activity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, WRITE_EXTERNAL_STORAGE_REQUEST);
-            }
-        }
-    }
+	private static final int READ_EXTERNAL_STORAGE_REQUEST=1;
+	private static final int WRITE_EXTERNAL_STORAGE_REQUEST=2;
 
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        listener = (OnNewGameRequestedListener) activity;
-    }
+	@TargetApi(23)
+	public static void checkAndRequestPermissions(final Activity activity) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+			if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+				activity.requestPermissions(new String[] {Manifest.permission.READ_EXTERNAL_STORAGE}, READ_EXTERNAL_STORAGE_REQUEST);
+			}
+			if (activity.getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+				activity.requestPermissions(new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, WRITE_EXTERNAL_STORAGE_REQUEST);
+			}
+		}
+	}
 
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        listener = null;
-    }
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		listener = (OnNewGameRequestedListener) activity;
+	}
 
-    private void setButtonState(final String playerName, final String displayInfo, int iconID, boolean isDead) {
-        startscreen_continue.setEnabled(hasExistingGame && !isDead);
-        startscreen_newgame.setEnabled(true);
-        if (hasExistingGame) {
-            TileManager tm = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorld().tileManager;
-            tm.setImageViewTileForPlayer(getResources(), save_preview_hero_icon, iconID);
-            save_preview_hero_desc.setText((isDead ? getString(R.string.rip_startscreen) : "") + playerName + ", " + displayInfo);
-            save_preview_holder.setVisibility(View.VISIBLE);
-        } else {
-            save_preview_holder.setVisibility(View.GONE);
-        }
-    }
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		listener = null;
+	}
 
-    private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
-        final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorldSetup();
-        setup.createNewCharacter = createNewCharacter;
-        setup.loadFromSlot = loadFromSlot;
-        setup.newHeroName = name;
-        startActivity(new Intent(getActivity(), LoadingActivity.class));
-    }
+	private void setButtonState(final String playerName, final String displayInfo, int iconID, boolean isDead) {
+		startscreen_continue.setEnabled(hasExistingGame && !isDead);
+		startscreen_newgame.setEnabled(true);
+		if (hasExistingGame) {
+			TileManager tm = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorld().tileManager;
+			tm.setImageViewTileForPlayer(getResources(), save_preview_hero_icon, iconID);
+			save_preview_hero_desc.setText((isDead ? getString(R.string.rip_startscreen) : "") + playerName + ", " + displayInfo);
+			save_preview_holder.setVisibility(View.VISIBLE);
+		} else {
+			save_preview_holder.setVisibility(View.GONE);
+		}
+	}
 
-    private void comfirmNewGame() {
+	private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
+		final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorldSetup();
+		setup.createNewCharacter = createNewCharacter;
+		setup.loadFromSlot = loadFromSlot;
+		setup.newHeroName = name;
+		startActivity(new Intent(getActivity(), LoadingActivity.class));
+	}
+
+	private void comfirmNewGame() {
 //		new AlertDialog.Builder(new ContextThemeWrapper(getActivity(), R.style.AndorsTrailStyle_Dialog))
 //		.setTitle(R.string.startscreen_newgame)
 //		.setMessage(R.string.startscreen_newgame_confirm)
@@ -307,39 +295,38 @@ public class StartScreenActivity_MainMenu extends Fragment {
 //		.create().show();
 //		
 //		
-        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);
-        CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                createNewGame();
-            }
-        });
-        CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
+		final CustomDialog 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);
+		CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				createNewGame();
+			}
+		});
+		CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
 
-        CustomDialogFactory.show(d);
+		CustomDialogFactory.show(d);
 
-    }
+	}
 
-    private static final String versionCheck = "lastversion";
+	private static final String versionCheck = "lastversion";
+	private boolean isNewVersion() {
+		SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
+		int lastversion = s.getInt(versionCheck, 0);
+		if (lastversion >= AndorsTrailApplication.CURRENT_VERSION) return false;
+		return true;
+	}
 
-    private boolean isNewVersion() {
-        SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
-        int lastversion = s.getInt(versionCheck, 0);
-        if (lastversion >= AndorsTrailApplication.CURRENT_VERSION) return false;
-        return true;
-    }
-
-    private void setCurrentVersionForVersionCheck() {
-        SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
-        Editor e = s.edit();
-        e.putInt(versionCheck, AndorsTrailApplication.CURRENT_VERSION);
-        e.commit();
-    }
+	private void setCurrentVersionForVersionCheck() {
+		SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
+		Editor e = s.edit();
+		e.putInt(versionCheck, AndorsTrailApplication.CURRENT_VERSION);
+		e.commit();
+	}
 
 
     @Override
@@ -347,19 +334,17 @@ public class StartScreenActivity_MainMenu extends Fragment {
         super.onActivityResult(requestCode, resultCode, data);
         switch (requestCode) {
             case INTENTREQUEST_LOADGAME:
-                if (resultCode != Activity.RESULT_OK) break;
-                final boolean wasImportOrExport = data.getBooleanExtra("import_export", false);
-                final int slot = data.getIntExtra("slot", 1);
-                if (wasImportOrExport) {
-                    if(slot == LoadSaveActivity.SLOT_NUMBER_EXPORT_SAVEGAMES)
-                        Toast.makeText(getActivity(),R.string.loadsave_export_save_successfull, Toast.LENGTH_LONG).show();
-                    else if(slot == LoadSaveActivity.SLOT_NUMBER_IMPORT_SAVEGAMES)
-                        Toast.makeText(getActivity(),R.string.loadsave_import_save_successfull, Toast.LENGTH_LONG).show();
-                    else if(slot == LoadSaveActivity.SLOT_NUMBER_IMPORT_WORLDMAP)
-                        Toast.makeText(getActivity(),R.string.loadsave_import_worldmap_successfull, Toast.LENGTH_LONG).show();
+				boolean unsuccessful = resultCode != Activity.RESULT_OK;
+				if(data == null) break;
 
-                    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;
+                final int slot = data.getIntExtra("slot", 1);
                 continueGame(false, slot, null);
                 break;
             case INTENTREQUEST_PREFERENCES:
@@ -368,7 +353,24 @@ public class StartScreenActivity_MainMenu extends Fragment {
         }
     }
 
-    private void updatePreferences(boolean alreadyStartedLoadingResources) {
+	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) {
         AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
         AndorsTrailPreferences preferences = app.getPreferences();
         preferences.read(getActivity());
@@ -398,17 +400,17 @@ public class StartScreenActivity_MainMenu extends Fragment {
     }
 
 
-    public interface OnNewGameRequestedListener {
-        public void onNewGameRequested();
-    }
+	public interface OnNewGameRequestedListener {
+		public void onNewGameRequested();
+	}
 
-    private OnNewGameRequestedListener listener = null;
+	private OnNewGameRequestedListener listener = null;
 
-    private void createNewGame() {
-        if (listener != null) {
-            listener.onNewGameRequested();
-        }
-    }
+	private void createNewGame() {
+		if (listener != null) {
+			listener.onNewGameRequested();
+		}
+	}
 
 
 }

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 = 30;
+	public static final int PERCENT_EXP_LOST_WHEN_DIED = 20;
 	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/InputController.java

@@ -2,6 +2,7 @@ package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.util.SparseIntArray;
 import android.view.KeyEvent;
 import android.view.View;
@@ -98,28 +99,36 @@ public final class InputController implements OnClickListener, OnLongClickListen
 
 		// Keys mapping to UP_LEFT
 		key = KEY_MOVE_UP_LEFT;
-		keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+			keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key);
+		}
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_7, key);
 		keyMap.put(KeyEvent.KEYCODE_7, key);
 		keyMap.put(KeyEvent.KEYCODE_MOVE_HOME, key);
 
 		// Keys mapping to UP_RIGHT		
 		key = KEY_MOVE_UP_RIGHT;
-		keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+			keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key);
+		}
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_9, key);
 		keyMap.put(KeyEvent.KEYCODE_9, key);
 		keyMap.put(KeyEvent.KEYCODE_PAGE_UP, key);
 
 		// Keys mapping to DOWN_LEFT
 		key = KEY_MOVE_DOWN_LEFT;
-		keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+			keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key);
+		}
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_1, key);
 		keyMap.put(KeyEvent.KEYCODE_1, key);
 		keyMap.put(KeyEvent.KEYCODE_MOVE_END, key);
 
 		// Keys mapping to DOWN_RIGHT		
 		key = KEY_MOVE_DOWN_RIGHT;
-		keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+			keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key);
+		}
 		keyMap.put(KeyEvent.KEYCODE_NUMPAD_3, key);
 		keyMap.put(KeyEvent.KEYCODE_3, key);
 		keyMap.put(KeyEvent.KEYCODE_PAGE_DOWN, key);

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

@@ -19,6 +19,7 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.util.HashMapHelper;
 
 public final class GameStatistics {
 	private int deaths = 0;
@@ -36,10 +37,10 @@ public final class GameStatistics {
 
 	public void addMonsterKill(MonsterType monsterType) {
 		// Track monster kills by type ID, for savegame file
-		killedMonstersByTypeID.put(monsterType.id, killedMonstersByTypeID.getOrDefault((monsterType.id), 0) + 1);
+		killedMonstersByTypeID.put(monsterType.id, getNumberOfKillsForMonsterType(monsterType.id) + 1);
 
 		// Also track by name, for statistics display (multiple IDs w/same name don't matter to player)
-		killedMonstersByName.put(monsterType.name, killedMonstersByName.getOrDefault(monsterType.name, 0) + 1);
+		killedMonstersByName.put(monsterType.name, getNumberOfKillsForMonsterName(monsterType.name) + 1);
 	}
 
 	public void addPlayerDeath(int lostExp) {
@@ -50,8 +51,7 @@ public final class GameStatistics {
 	}
 	public void addItemUsage(ItemType type) {
 		final String n = type.id;
-		if (!usedItems.containsKey(n)) usedItems.put(n, 1);
-		else usedItems.put(n, usedItems.get(n) + 1);
+		usedItems.put(n, HashMapHelper.getOrDefault(usedItems, n,0) + 1);
 	}
 
 	public int getDeaths() {
@@ -73,15 +73,11 @@ public final class GameStatistics {
 	public boolean isDead() { return !hasUnlimitedLives() && getLivesLeft() < 1; }
 
 	public int getNumberOfKillsForMonsterType(String monsterTypeID) {
-		Integer v = killedMonstersByTypeID.get(monsterTypeID);
-		if (v == null) return 0;
-		return v;
+		return HashMapHelper.getOrDefault(killedMonstersByTypeID, monsterTypeID, 0);
 	}
 
 	public int getNumberOfKillsForMonsterName(String monsterName) {
-		Integer v = killedMonstersByName.get(monsterName);
-		if (v == null) return 0;
-		return v;
+		return HashMapHelper.getOrDefault(killedMonstersByName, monsterName, 0);
 	}
 
 	public String getTop5MostCommonlyKilledMonsters(WorldContext world, Resources res) {
@@ -144,20 +140,15 @@ public final class GameStatistics {
 	}
 
 	public int getNumberOfUsedItems() {
-		int result = 0;
-		for (int v : usedItems.values()) result += v;
-		return result;
+		return HashMapHelper.sumIntegerValues(usedItems);
 	}
 
 	public int getNumberOfTimesItemHasBeenUsed(String itemId) {
-		if (!usedItems.containsKey(itemId)) return 0;
-		return usedItems.get(itemId);
+		return HashMapHelper.getOrDefault(usedItems, itemId, 0);
 	}
 
 	public int getNumberOfKilledMonsters() {
-		int result = 0;
-		for (int v : killedMonstersByTypeID.values()) result += v;
-		return result;
+		return HashMapHelper.sumIntegerValues(killedMonstersByTypeID);
 	}
 
 	private static final Comparator<Entry<String, Integer>> descendingValueComparator = new Comparator<Entry<String, Integer>>() {
@@ -186,7 +177,7 @@ public final class GameStatistics {
 			// Also track by name, for statistics display (multiple IDs w/same name don't matter to player)
 			MonsterType t = world.monsterTypes.getMonsterType(id);
 
-			if (t != null) 	killedMonstersByName.put(t.name, killedMonstersByName.getOrDefault(t.name, 0) + value);
+			if (t != null) 	killedMonstersByName.put(t.name, getNumberOfKillsForMonsterName(t.name) + value);
 		}
 
 		if (fileversion <= 17) return;

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 = 5;
+	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 10;
 	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 = 0;
+		baseTraits.blockChance = 9;
 		baseTraits.damageResistance = 0;
 		baseTraits.useItemCost = 5;
 		baseTraits.reequipCost = 5;

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

@@ -308,6 +308,7 @@ public final class ResourceLoader {
 		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_omi2, "items_omi2", new Size(6, 5), sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.items_omgeeky, "items_omgeeky", new Size(10, 3), sz1x1, mTileSize);
 		/*INSERT_ITEMS_TILESETS_HERE*/
 		
 		loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", sz1x1, sz1x1, mTileSize);
@@ -435,6 +436,7 @@ public final class ResourceLoader {
 		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);
+		loader.prepareTileset(R.drawable.map_ratdom, "map_ratdom", new Size(18, 6), 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/savegames/Savegames.java

@@ -1,7 +1,6 @@
 package com.gpl.rpg.AndorsTrail.savegames;
 
 import java.io.ByteArrayOutputStream;
-import java.io.Console;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -34,95 +33,99 @@ import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
 import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class Savegames {
-    public static final int SLOT_QUICKSAVE = 0;
-    public static final long DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED = -1;
+	public static final int SLOT_QUICKSAVE = 0;
+	public static final long DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED = -1;
 
-    private static long lastBackup = 0;
+	private static long lastBackup = 0;
 
 
-    public static enum LoadSavegameResult {
-        success, unknownError, savegameIsFromAFutureVersion, cheatingDetected
-    }
 
-    public static boolean saveWorld(WorldContext world, Context androidContext, int slot) {
-        try {
-            final String displayInfo = androidContext.getString(R.string.savegame_currenthero_displayinfo, world.model.player.getLevel(), world.model.player.getTotalExperience(), world.model.player.getGold());
-            if (slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
-                world.model.player.savedVersion++;
-            }
-            String id = world.model.player.id;
-            long savedVersion = world.model.player.savedVersion;
+	public static enum LoadSavegameResult {
+		success
+		, unknownError
+		, savegameIsFromAFutureVersion
+		, cheatingDetected
+	}
 
-            // Create the savegame in a temporary memorystream first to ensure that the savegame can
-            // be created correctly. We don't want to trash the user's file unneccessarily if there is an error.
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            saveWorld(world, bos, displayInfo);
-            byte[] savegame = bos.toByteArray();
-            bos.close();
+	public static boolean saveWorld(WorldContext world, Context androidContext, int slot) {
+		try {
+			final String displayInfo = androidContext.getString(R.string.savegame_currenthero_displayinfo, world.model.player.getLevel(), world.model.player.getTotalExperience(), world.model.player.getGold());
+			if (slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
+				world.model.player.savedVersion++;
+			}
+			String id = world.model.player.id;
+			long savedVersion = world.model.player.savedVersion;
 
-            FileOutputStream fos = getOutputFile(androidContext, slot);
-            fos.write(savegame);
-            fos.close();
+			// Create the savegame in a temporary memorystream first to ensure that the savegame can
+			// be created correctly. We don't want to trash the user's file unneccessarily if there is an error.
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			saveWorld(world, bos, displayInfo);
+			byte[] savegame = bos.toByteArray();
+			bos.close();
 
-            if (!world.model.statistics.hasUnlimitedSaves()) {
-                if (slot != SLOT_QUICKSAVE) {
-                    androidContext.deleteFile(Constants.FILENAME_SAVEGAME_QUICKSAVE);
-                    writeCheatCheck(androidContext, savedVersion, id);
-                } else if (SystemClock.uptimeMillis() > lastBackup + 120000) {
-                    writeBackup(androidContext, savegame, id);
-                    lastBackup = SystemClock.uptimeMillis();
-                }
-            }
+			FileOutputStream fos = getOutputFile(androidContext, slot);
+			fos.write(savegame);
+			fos.close();
 
-            return true;
-        } catch (IOException e) {
-            L.log("Error saving world: " + e.toString());
-            return false;
-        }
-    }
+			if (!world.model.statistics.hasUnlimitedSaves()) {
+				if (slot != SLOT_QUICKSAVE) {
+					androidContext.deleteFile(Constants.FILENAME_SAVEGAME_QUICKSAVE);
+					writeCheatCheck(androidContext, savedVersion, id);
+				} else if (SystemClock.uptimeMillis() > lastBackup + 120000) {
+					writeBackup(androidContext, savegame, id);
+					lastBackup = SystemClock.uptimeMillis();
+				}
+			}
 
-    private static void writeBackup(Context androidContext, byte[] savegame, String playerId) throws IOException {
-        File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
+			return true;
+		} catch (IOException e) {
+			L.log("Error saving world: " + e.toString());
+			return false;
+		}
+	}
+
+	private static void writeBackup(Context androidContext, byte[] savegame, String playerId) throws IOException {
+		File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
         ensureDirExists(cheatDetectionFolder);
-        File backupFile = new File(cheatDetectionFolder, playerId + "X");
-        FileOutputStream fileOutputStream = new FileOutputStream(backupFile);
-        fileOutputStream.write(savegame);
-        fileOutputStream.close();
-    }
+		File backupFile = new File(cheatDetectionFolder, playerId + "X");
+		FileOutputStream fileOutputStream = new FileOutputStream(backupFile);
+		fileOutputStream.write(savegame);
+		fileOutputStream.close();
+	}
 
-    public static LoadSavegameResult loadWorld(WorldContext world, ControllerContext controllers, Context androidContext, int slot) {
-        try {
-            FileHeader fh = quickload(androidContext, slot);
-            if (fh == null) {
-                return LoadSavegameResult.unknownError;
-            }
-            if (!fh.hasUnlimitedSaves && slot != SLOT_QUICKSAVE && triedToCheat(androidContext, fh)) {
-                return LoadSavegameResult.cheatingDetected;
-            }
+	public static LoadSavegameResult loadWorld(WorldContext world, ControllerContext controllers, Context androidContext, int slot) {
+		try {
+			FileHeader fh = quickload(androidContext, slot);
+			if(fh == null) {
+				return LoadSavegameResult.unknownError;
+			}
+			if (!fh.hasUnlimitedSaves && slot != SLOT_QUICKSAVE && triedToCheat(androidContext, fh)) {
+				return LoadSavegameResult.cheatingDetected;
+			}
 
-            FileInputStream fos = getInputFile(androidContext, slot);
-            LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos, fh);
-            fos.close();
-            if (result == LoadSavegameResult.success && slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
+			FileInputStream fos = getInputFile(androidContext, slot);
+			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos, fh);
+			fos.close();
+			if (result == LoadSavegameResult.success && slot != SLOT_QUICKSAVE && !world.model.statistics.hasUnlimitedSaves()) {
                 // save to the quicksave slot before deleting the file
                 if (!saveWorld(world, androidContext, SLOT_QUICKSAVE)) {
-                    return LoadSavegameResult.unknownError;
-                }
-                getSlotFile(slot, androidContext).delete();
-                writeCheatCheck(androidContext, DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED, fh.playerId);
-            }
-            return result;
-        } catch (IOException e) {
-            if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
-                L.log("Error loading world: " + e.toString());
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw);
-                e.printStackTrace(pw);
-                L.log("Load error: " + sw.toString());
-            }
-            return LoadSavegameResult.unknownError;
-        }
-    }
+					return LoadSavegameResult.unknownError;
+				}
+				getSlotFile(slot, androidContext).delete();
+				writeCheatCheck(androidContext, DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED, fh.playerId);
+			}
+			return result;
+		} catch (IOException e) {
+			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
+				L.log("Error loading world: " + e.toString());
+				StringWriter sw = new StringWriter();
+				PrintWriter pw = new PrintWriter(sw);
+				e.printStackTrace(pw);
+				L.log("Load error: " + sw.toString());
+			}
+			return LoadSavegameResult.unknownError;
+		}
+	}
 
     private static boolean triedToCheat(Context androidContext, FileHeader fh) throws IOException {
         long savedVersionToCheck = 0;
@@ -138,9 +141,9 @@ public final class Savegames {
             fileInputStream.close();
         }
 
-        if (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED) {
-            return true;
-        }
+		if (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED) {
+			return true;
+		}
 
         if (androidContext.getFileStreamPath(fh.playerId).exists()) {
             FileInputStream fileInputStream = androidContext.openFileInput(fh.playerId);
@@ -152,16 +155,16 @@ public final class Savegames {
                 savedVersionToCheck = cheatDetection.savedVersion;
             }
 
-            if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
-                L.log("Internal cheatcheck file savedVersion: " + cheatDetection.savedVersion);
-            }
+			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
+				L.log("Internal cheatcheck file savedVersion: " + cheatDetection.savedVersion);
+			}
 
-            dataInputStream.close();
-            fileInputStream.close();
-        }
+			dataInputStream.close();
+			fileInputStream.close();
+		}
 
-        return (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED || fh.savedVersion < savedVersionToCheck);
-    }
+		return (savedVersionToCheck == DENY_LOADING_BECAUSE_GAME_IS_CURRENTLY_PLAYED || fh.savedVersion < savedVersionToCheck);
+	}
 
     private static FileOutputStream getOutputFile(Context androidContext, int slot) throws IOException {
         if (slot == SLOT_QUICKSAVE) {
@@ -207,18 +210,18 @@ public final class Savegames {
     }
 
 
-    public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
-        DataOutputStream dest = new DataOutputStream(outStream);
-        FileHeader.writeToParcel(dest, world.model.player.getName(),
-                displayInfo, world.model.player.iconID,
-                world.model.statistics.isDead(),
-                world.model.statistics.hasUnlimitedSaves(),
-                world.model.player.id,
-                world.model.player.savedVersion);
-        world.maps.writeToParcel(dest, world);
-        world.model.writeToParcel(dest);
-        dest.close();
-    }
+	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
+		DataOutputStream dest = new DataOutputStream(outStream);
+		FileHeader.writeToParcel(dest, world.model.player.getName(),
+				displayInfo, world.model.player.iconID,
+				world.model.statistics.isDead(),
+				world.model.statistics.hasUnlimitedSaves(),
+				world.model.player.id,
+				world.model.player.savedVersion);
+		world.maps.writeToParcel(dest, world);
+		world.model.writeToParcel(dest);
+		dest.close();
+	}
 
     public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState, FileHeader fh) throws IOException {
         DataInputStream src = new DataInputStream(inState);
@@ -226,42 +229,42 @@ public final class Savegames {
         if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION)
             return LoadSavegameResult.savegameIsFromAFutureVersion;
 
-        world.maps.readFromParcel(src, world, controllers, header.fileversion);
-        world.model = new ModelContainer(src, world, controllers, header.fileversion);
-        src.close();
+		world.maps.readFromParcel(src, world, controllers, header.fileversion);
+		world.model = new ModelContainer(src, world, controllers, header.fileversion);
+		src.close();
+		
+		if (header.fileversion < 45) {
+			LegacySavegamesContentAdaptations.adaptToNewContentForVersion45(world, controllers, res);
+		}
+		
+		onWorldLoaded(res, world, controllers);
 
-        if (header.fileversion < 45) {
-            LegacySavegamesContentAdaptations.adaptToNewContentForVersion45(world, controllers, res);
-        }
+		return LoadSavegameResult.success;
+	}
 
-        onWorldLoaded(res, world, controllers);
+	private static void onWorldLoaded(Resources res, WorldContext world, ControllerContext controllers) {
+		controllers.actorStatsController.recalculatePlayerStats(world.model.player);
+		controllers.mapController.resetMapsNotRecentlyVisited();
+		controllers.movementController.prepareMapAsCurrentMap(world.model.currentMaps.map, res, false);
+		controllers.gameRoundController.resetRoundTimers();
+	}
 
-        return LoadSavegameResult.success;
-    }
-
-    private static void onWorldLoaded(Resources res, WorldContext world, ControllerContext controllers) {
-        controllers.actorStatsController.recalculatePlayerStats(world.model.player);
-        controllers.mapController.resetMapsNotRecentlyVisited();
-        controllers.movementController.prepareMapAsCurrentMap(world.model.currentMaps.map, res, false);
-        controllers.gameRoundController.resetRoundTimers();
-    }
-
-    public static FileHeader quickload(Context androidContext, int slot) {
-        try {
-            if (slot != SLOT_QUICKSAVE) {
-                File f = getSlotFile(slot, androidContext);
-                if (!f.exists()) return null;
-            }
-            FileInputStream fos = getInputFile(androidContext, slot);
-            DataInputStream src = new DataInputStream(fos);
-            final FileHeader header = new FileHeader(src, false);
-            src.close();
-            fos.close();
-            return header;
-        } catch (Exception e) {
-            return null;
-        }
-    }
+	public static FileHeader quickload(Context androidContext, int slot) {
+		try {
+			if (slot != SLOT_QUICKSAVE) {
+				File f = getSlotFile(slot, androidContext);
+				if (!f.exists()) return null;
+			}
+			FileInputStream fos = getInputFile(androidContext, slot);
+			DataInputStream src = new DataInputStream(fos);
+			final FileHeader header = new FileHeader(src, false);
+			src.close();
+			fos.close();
+			return header;
+		} catch (Exception e) {
+			return null;
+		}
+	}
 
     private static void writeCheatCheck(Context androidContext, long savedVersion, String playerId) throws IOException {
         File cheatDetectionFolder = AndroidStorage.getStorageDirectory(androidContext, Constants.CHEAT_DETECTION_FOLDER);
@@ -273,14 +276,14 @@ public final class Savegames {
         dataOutputStream.close();
         fileOutputStream.close();
 
-        fileOutputStream = androidContext.openFileOutput(playerId, Context.MODE_PRIVATE);
-        dataOutputStream = new DataOutputStream(fileOutputStream);
-        CheatDetection.writeToParcel(dataOutputStream, savedVersion);
-        dataOutputStream.close();
-        fileOutputStream.close();
-    }
+		fileOutputStream = androidContext.openFileOutput(playerId, Context.MODE_PRIVATE);
+		dataOutputStream = new DataOutputStream(fileOutputStream);
+		CheatDetection.writeToParcel(dataOutputStream, savedVersion);
+		dataOutputStream.close();
+		fileOutputStream.close();
+	}
 
-    private static final Pattern savegameFilenamePattern = Pattern.compile(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + "(\\d+)");
+	private static final Pattern savegameFilenamePattern = Pattern.compile(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + "(\\d+)");
 
     public static List<Integer> getUsedSavegameSlots(Context context) {
         try {
@@ -303,22 +306,22 @@ public final class Savegames {
         }
     }
 
-    private static final class CheatDetection {
-        public final int fileversion;
-        public final long savedVersion;
+	private static final class CheatDetection {
+		public final int fileversion;
+		public final long savedVersion;
 
-        // ====== PARCELABLE ===================================================================
+		// ====== PARCELABLE ===================================================================
 
-        public CheatDetection(DataInputStream src) throws IOException {
-            this.fileversion = src.readInt();
-            this.savedVersion = src.readLong();
-        }
+		public CheatDetection(DataInputStream src) throws IOException {
+			this.fileversion = src.readInt();
+			this.savedVersion = src.readLong();
+		}
 
-        public static void writeToParcel(DataOutputStream dest, long savedVersion) throws IOException {
-            dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
-            dest.writeLong(savedVersion);
-        }
-    }
+		public static void writeToParcel(DataOutputStream dest, long savedVersion) throws IOException {
+			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
+			dest.writeLong(savedVersion);
+		}
+	}
 
 
     public static final class FileHeader {
@@ -332,12 +335,12 @@ public final class Savegames {
         public final String playerId;
         public final long savedVersion;
 
-        public String describe() {
-            return (fileversion == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION ? "(D) " : "") + playerName + ", " + displayInfo;
-        }
+		public String describe() {
+			return (fileversion == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION ? "(D) " : "") + playerName + ", " + displayInfo;
+		}
 
 
-        // ====== PARCELABLE ===================================================================
+		// ====== PARCELABLE ===================================================================
 
         public FileHeader(DataInputStream src, boolean skipIcon) throws IOException {
             int fileversion = src.readInt();
@@ -352,40 +355,40 @@ public final class Savegames {
                 this.displayInfo = null;
             }
 
-            if (fileversion >= 43) {
-                int id = src.readInt();
-                if (skipIcon || id > TileManager.LAST_HERO) {
-                    this.iconID = TileManager.CHAR_HERO_0;
-                    this.skipIcon = true;
-                } else {
-                    this.iconID = id;
-                }
-            } else {
-                this.iconID = TileManager.CHAR_HERO_0;
-            }
+			if (fileversion >= 43) {
+				int id = src.readInt();
+				if (skipIcon || id > TileManager.LAST_HERO) {
+					this.iconID = TileManager.CHAR_HERO_0;
+					this.skipIcon = true;
+				} else {
+					this.iconID = id;
+				}
+			} else {
+				this.iconID = TileManager.CHAR_HERO_0;
+			}
 
-            if (fileversion >= 49) {
-                this.isDead = src.readBoolean();
-                this.hasUnlimitedSaves = src.readBoolean();
-                this.playerId = src.readUTF();
-                this.savedVersion = src.readLong();
-            } else {
-                this.isDead = false;
-                this.hasUnlimitedSaves = true;
-                this.playerId = "";
-                this.savedVersion = 0;
-            }
-        }
+			if (fileversion >= 49) {
+				this.isDead = src.readBoolean();
+				this.hasUnlimitedSaves = src.readBoolean();
+				this.playerId = src.readUTF();
+				this.savedVersion = src.readLong();
+			} else {
+				this.isDead = false;
+				this.hasUnlimitedSaves = true;
+				this.playerId = "";
+				this.savedVersion = 0;
+			}
+		}
 
-        public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID, boolean isDead, boolean hasUnlimitedSaves, String playerId, long savedVersion) throws IOException {
-            dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
-            dest.writeUTF(playerName);
-            dest.writeUTF(displayInfo);
-            dest.writeInt(iconID);
-            dest.writeBoolean(isDead);
-            dest.writeBoolean(hasUnlimitedSaves);
-            dest.writeUTF(playerId);
-            dest.writeLong(savedVersion);
-        }
-    }
+		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID, boolean isDead, boolean hasUnlimitedSaves, String playerId, long savedVersion) throws IOException {
+			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
+			dest.writeUTF(playerName);
+			dest.writeUTF(displayInfo);
+			dest.writeInt(iconID);
+			dest.writeBoolean(isDead);
+			dest.writeBoolean(hasUnlimitedSaves);
+			dest.writeUTF(playerId);
+			dest.writeLong(savedVersion);
+		}
+	}
 }

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

@@ -6,20 +6,30 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-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) {
@@ -33,16 +43,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;
@@ -51,11 +61,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.toString());
+            L.log("Error migrating data: " + e);
             return false;
         }
         return true;
@@ -96,68 +106,187 @@ 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 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 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,
+                                                           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) {
-            Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail_beta2.fileprovider", worldmap);
+            String applicationId = context.getPackageName();
+            Uri uri = FileProvider.getUriForFile(context, applicationId + ".fileprovider", worldmap);
             return uri.toString();
         } else {
             return "file://" + worldmap.getAbsolutePath();
         }
     }
 
-
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public static Intent getNewOpenDirectoryIntent() {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        return intent;
+        return new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -168,4 +297,176 @@ 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

@@ -0,0 +1,46 @@
+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/util/HashMapHelper.java

@@ -0,0 +1,16 @@
+package com.gpl.rpg.AndorsTrail.util;
+
+import java.util.HashMap;
+
+public final class HashMapHelper {
+	public static <K,V> V getOrDefault(HashMap<K,V> map, K key, V defaultValue) {
+		V v = map.get(key);
+		return v == null ? defaultValue : v;
+	}
+	public static <K> Integer sumIntegerValues(HashMap<K,Integer> map) {
+		int sum = 0;
+		for (Integer v : map.values()) sum += v;
+		return sum;
+	}
+
+}

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;
@@ -23,166 +23,225 @@ import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public class CustomDialogFactory {
 
-    public static class CustomDialog extends Dialog {
-        public CustomDialog(Context context) {
-            super(context);
-        }
+	public static class CustomDialog extends android.app.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) {
-        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) {
+		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 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);
+	public static CustomDialog createDialog(final Context context, String title, Drawable icon,
+											String desc, View content, boolean hasButtons,
+											final boolean canDismiss, final boolean verticalButtons) {
+		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 {
-                    if (canDismiss) {
-                        this.dismiss();
-                        return true;
-                    }
-                    return false;
-                }
-            }
+				if (r.contains((int)event.getX(), (int)event.getY())) {
+					return super.onTouchEvent(event);
+				} else {
+					if (canDismiss) {
+						this.dismiss();
+						return true;
+					}
+					return false;
+				}
+			}
 
-            @Override
-            public void onWindowFocusChanged(boolean hasFocus) {
-                super.onWindowFocusChanged(hasFocus);
-                TextView title = (TextView) this.getWindow().getDecorView().findViewById(R.id.dialog_title);
-                if (title != null && title.getCompoundDrawables() != null && title.getCompoundDrawables()[0] != null) {
-                    if (title.getCompoundDrawables()[0] instanceof AnimationDrawable) {
-                        ((AnimationDrawable) title.getCompoundDrawables()[0]).start();
-                    }
-                }
-            }
-        };
+			@Override
+			public void onWindowFocusChanged(boolean hasFocus) {
+				super.onWindowFocusChanged(hasFocus);
+				TextView title = (TextView) this.getWindow().getDecorView().findViewById(R.id.dialog_title);
+				if (title != null && title.getCompoundDrawables() != null && title.getCompoundDrawables()[0] != null) {
+					if (title.getCompoundDrawables()[0] instanceof AnimationDrawable) {
+						((AnimationDrawable)title.getCompoundDrawables()[0]).start();
+					}
+				}
+			}
+		};
+		dialog.verticalButtons = verticalButtons;
 
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(R.layout.custom_dialog_title_icon);
-        dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-        if (((AndorsTrailApplication) context.getApplicationContext()).getPreferences().fullscreen) {
-            dialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        } else {
-            dialog.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
+		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		dialog.setContentView(R.layout.custom_dialog_title_icon);
+		dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+		if (((AndorsTrailApplication)context.getApplicationContext()).getPreferences().fullscreen) {
+			dialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		} else {
+			dialog.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
 
-        setTitle(dialog, title, icon);
+		setTitle(dialog, title, icon);
 
-        setDesc(dialog, desc);
+		setDesc(dialog, desc);
 
-        setContent(dialog, content);
+		setContent(dialog, content);
 
-        ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
-        if (hasButtons) {
-            buttonsHolder.setVisibility(View.VISIBLE);
-        } else {
-            buttonsHolder.setVisibility(View.GONE);
-        }
+		ViewGroup buttonsHolder = getButtonContainer(dialog);
+		ViewGroup unusedButtonsHolder = getUnusedButtonContainer(dialog);
 
-        return dialog;
-    }
+		unusedButtonsHolder.setVisibility(View.GONE);
+		if (hasButtons) {
+			buttonsHolder.setVisibility(View.VISIBLE);
+		} else {
+			buttonsHolder.setVisibility(View.GONE);
+		}
 
-    public static CustomDialog createErrorDialog(final Context context, String title, String description) {
-        final CustomDialog d = createDialog(context,
-                title,
-                context.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                description,
-                null,
-                true);
-        CustomDialogFactory.addDismissButton(d, android.R.string.ok);
-        return d;
-    }
+		return dialog;
+	}
 
-    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) {
-            titleView.setText(title);
-            titleView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
-            titleView.setVisibility(View.VISIBLE);
-        } else {
-            titleView.setVisibility(View.GONE);
-        }
-        return dialog;
-    }
+	public static CustomDialog createErrorDialog(final Context context, String title, String description) {
+		final CustomDialog d = createDialog(context,
+				title,
+				context.getResources().getDrawable(android.R.drawable.ic_dialog_alert),
+				description,
+				null,
+				true);
+		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
+		return d;
+	}
 
-    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);
-        if (desc != null) {
-            descView.setText(desc);
-            descHolder.setVisibility(View.VISIBLE);
-            descView.setVisibility(View.VISIBLE);
-        } else {
-            descHolder.setVisibility(View.GONE);
-        }
-        return dialog;
-    }
+	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) {
+			titleView.setText(title);
+			titleView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+			titleView.setVisibility(View.VISIBLE);
+		} else {
+			titleView.setVisibility(View.GONE);
+		}
+		return dialog;
+	}
 
-    public static CustomDialog setContent(final CustomDialog dialog, View content) {
-        ViewGroup contentHolder = (ViewGroup) dialog.findViewById(R.id.dialog_content_container);
-        if (content != null) {
-            contentHolder.addView(content);
-            contentHolder.setVisibility(View.VISIBLE);
-        } else {
-            contentHolder.setVisibility(View.GONE);
-        }
-        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);
+		if (desc != null) {
+			descView.setText(desc);
+			descHolder.setVisibility(View.VISIBLE);
+			descView.setVisibility(View.VISIBLE);
+		} else {
+			descHolder.setVisibility(View.GONE);
+		}
+		return dialog;
+	}
 
-    public static Dialog addButton(final Dialog dialog, int textId, final OnClickListener listener) {
+	public static CustomDialog setContent(final CustomDialog dialog, View content) {
+		ViewGroup contentHolder = (ViewGroup) dialog.findViewById(R.id.dialog_content_container);
+		if (content != null) {
+			contentHolder.addView(content);
+			contentHolder.setVisibility(View.VISIBLE);
+		} else {
+			contentHolder.setVisibility(View.GONE);
+		}
+		return dialog;
+	}
 
-        Button template = (Button) dialog.findViewById(R.id.dialog_template_button);
-        LayoutParams params = template.getLayoutParams();
-        ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
+	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);
+		LayoutParams params = template.getLayoutParams();
+		ViewGroup buttonsHolder = getButtonContainer(dialog);
 
-        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));
+		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));
 
-        b.setText(textId);
-        b.setOnClickListener(new OnClickListener() {
+		if(textId != -1) {
+			b.setText(textId);
+		} else {
+			b.setText(text);
+		}
 
-            @Override
-            public void onClick(View v) {
-                listener.onClick(v);
-                dialog.dismiss();
-            }
-        });
+		b.setOnClickListener(new OnClickListener() {
 
-        buttonsHolder.addView(b, params);
-        return dialog;
-    }
+			@Override
+			public void onClick(View v) {
+				listener.onClick(v);
+				dialog.dismiss();
+			}
+		});
 
-    public static Dialog addDismissButton(final Dialog dialog, int textId) {
-        return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
+		buttonsHolder.addView(b, params);
+		return dialog;
+	}
 
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-            }
-        });
-    }
+	public static CustomDialog addDismissButton(final CustomDialog dialog, int textId) {
+		return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
 
-    public static Dialog setDismissListener(Dialog dialog, OnDismissListener listener) {
-        dialog.setOnDismissListener(listener);
+			@Override
+			public void onClick(View v) {
+				dialog.dismiss();
+			}
+		});
+	}
+	public static CustomDialog addCancelButton(final CustomDialog dialog, int textId) {
+		return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
 
-        return dialog;
-    }
+			@Override
+			public void onClick(View v) {
+				dialog.cancel();
+			}
+		});
+	}
 
-    public static void show(Dialog dialog) {
+	public static CustomDialog setDismissListener(CustomDialog dialog, OnDismissListener listener) {
+		dialog.setOnDismissListener(listener);
 
-        dialog.findViewById(R.id.dialog_template_button).setVisibility(View.GONE);
-        dialog.show();
+		return dialog;
+	}
 
-    }
+	public static CustomDialog setCancelListener(CustomDialog dialog, OnCancelListener listener) {
+		dialog.setOnCancelListener(listener);
+		return dialog;
+	}
+
+	public static void show(CustomDialog 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,13 +9,15 @@ 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 Dialog spinnerDialog = null;
+	private CustomDialog spinnerDialog = null;
 	private ListView choicesList;
 	private Context context;