From 31616c82eb5a5548127ddd965a39c6d5dbeb3f69 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 3 Feb 2019 20:29:36 +0300
Subject: always start with downloads when picking dir because otherwise
 there's no way to go back to internal or external

---
 org.fox.ttcomics/src/main/AndroidManifest.xml                       | 4 ++--
 .../src/main/java/org/fox/ttcomics2/PreferencesActivity.java        | 6 +-----
 org.fox.ttcomics/src/main/res/xml/preferences.xml                   | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 076dea1..4342ef8 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.fox.ttcomics2"
-    android:versionCode="87"
-    android:versionName="1.45" >
+    android:versionCode="88"
+    android:versionName="1.46" >
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
index c61d136..d65ec9a 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
@@ -64,11 +64,7 @@ public class PreferencesActivity extends CommonActivity {
     public void startPicker(String initialDir) {
         Intent intent = new Intent(PreferencesActivity.this, DirectoryChooserActivity.class);
 
-        SharedPreferences prefs = PreferenceManager
-                .getDefaultSharedPreferences(getApplicationContext());
-
-        if (initialDir == null) initialDir = prefs.getString("comics_directory",
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
+        if (initialDir == null) initialDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
 
         intent.putExtra(DirectoryChooserActivity.EXTRA_CONFIG, DirectoryChooserConfig.builder()
                 .newDirectoryName("Comics")
diff --git a/org.fox.ttcomics/src/main/res/xml/preferences.xml b/org.fox.ttcomics/src/main/res/xml/preferences.xml
index 67171fc..c38e0b4 100755
--- a/org.fox.ttcomics/src/main/res/xml/preferences.xml
+++ b/org.fox.ttcomics/src/main/res/xml/preferences.xml
@@ -8,6 +8,7 @@
             android:summary="@string/prefs_comics_directory_summary"
             android:title="@string/prefs_comics_directory" >
         </Preference>
+
         <Preference
             android:key="open_storage_dir"
             android:summary="@string/prefs_open_storage_dir_summary"
-- 
cgit v1.2.3