From 7ab903fddabe8ede4e6efc94805b4d1112b647b4 Mon Sep 17 00:00:00 2001
From: Luis Gallardo <lgallard@gmail.com>
Date: Sun, 27 Sep 2015 04:36:03 -0430
Subject: [PATCH] Release 4.1.9

* Removed "Sort by" from Settings.
* Fixed issue when loading torrent details
* Fixed issue when choosing a server in Settings for the Free version
---
 app/app.iml                                   |  2 +-
 app/build.gradle                              |  8 ++---
 .../qbittorrentclient/SettingsActivity.java   | 31 +++++++++----------
 .../TorrentDetailsFragment.java               |  3 +-
 app/src/main/res/xml/preferences.xml          | 17 ----------
 5 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index c4439061..a1e23c4a 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -21,7 +21,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/pro/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/free/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
diff --git a/app/build.gradle b/app/build.gradle
index ddf53f6d..de59ee0d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,18 +30,18 @@ android {
     productFlavors {
         pro {
             applicationId 'com.lgallardo.qbittorrentclientpro'
-            versionName '4.1.8'
+            versionName '4.1.9'
             minSdkVersion 14
             targetSdkVersion 21
-            versionCode 418
+            versionCode 419
             archivesBaseName = "qBittorrentController_v" + versionName
         }
         free {
             applicationId "com.lgallardo.qbittorrentclient"
-            versionName '4.1.8'
+            versionName '4.1.9'
             minSdkVersion 14
             targetSdkVersion 21
-            versionCode 418
+            versionCode 419
         }
     }
 
diff --git a/app/src/main/java/com/lgallardo/qbittorrentclient/SettingsActivity.java b/app/src/main/java/com/lgallardo/qbittorrentclient/SettingsActivity.java
index 9c5a4287..0b16a5f2 100644
--- a/app/src/main/java/com/lgallardo/qbittorrentclient/SettingsActivity.java
+++ b/app/src/main/java/com/lgallardo/qbittorrentclient/SettingsActivity.java
@@ -44,9 +44,6 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
     private EditTextPreference connection_timeout;
     private EditTextPreference data_timeout;
 
-    private ListPreference sortBy;
-    private CheckBoxPreference reverse_order;
-
     private CheckBoxPreference dark_ui;
 
     private CheckBoxPreference enable_notifications;
@@ -74,8 +71,6 @@ protected void onCreate(Bundle savedInstanceState) {
         refresh_period = (ListPreference) findPreference("refresh_period");
         connection_timeout = (EditTextPreference) findPreference("connection_timeout");
         data_timeout = (EditTextPreference) findPreference("data_timeout");
-        sortBy = (ListPreference) findPreference("sortby");
-        reverse_order = (CheckBoxPreference) findPreference("reverse_order");
 
         dark_ui = (CheckBoxPreference) findPreference("dark_ui");
 
@@ -93,6 +88,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 
                 if (MainActivity.packageName.equals("com.lgallardo.qbittorrentclient")) {
 
+
                     Builder builder = new Builder(SettingsActivity.this);
 
                     // Message
@@ -110,13 +106,22 @@ public void onClick(DialogInterface dialog, int id) {
                     });
 
                     // Create dialog
-                    AlertDialog dialog = builder.create();
+                    final AlertDialog dialog = builder.create();
+
+                    // This detects if the back button was press while showing the dialog
+                    dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                        @Override
+                        public void onCancel(DialogInterface dialog) {
+                            //do whatever you want the back key to do
+                            // Set first server
+                            currentServer.setValueIndex(0);
+
+                        }
+                    });
 
                     // Show dialog
                     dialog.show();
 
-                    // Set first server
-                    currentServer.setValueIndex(0);
 
                 } else {
 
@@ -201,12 +206,6 @@ public void getQBittorrentServerValues(String value) {
         data_timeout.setText(sharedPrefs.getString("data_timeout" + value, "20"));
         data_timeout.setSummary(sharedPrefs.getString("data_timeout" + value, "20"));
 
-        if (sortBy.getEntry() == null) {
-            sortBy.setValueIndex(1);
-        }
-
-        sortBy.setSummary(sortBy.getEntry());
-        reverse_order.setChecked(sharedPrefs.getBoolean("reverse_order" + value, false));
 
         dark_ui.setChecked(sharedPrefs.getBoolean("dark_ui", false));
 
@@ -226,7 +225,6 @@ public void refreshScreenValues() {
         port.setSummary(port.getText());
         username.setSummary(username.getText());
         refresh_period.setSummary(refresh_period.getEntry());
-        sortBy.setSummary(sortBy.getEntry());
         notification_period.setSummary(notification_period.getEntry());
         connection_timeout.setSummary(connection_timeout.getText());
         data_timeout.setSummary(data_timeout.getText());
@@ -242,6 +240,7 @@ public void saveQBittorrentServerValues() {
 
         Editor editor = sharedPrefs.edit();
 
+
         if (hostname.getText().toString() != null && hostname.getText().toString() != "") {
             editor.putString("hostname" + currentServerValue, hostname.getText().toString());
         }
@@ -275,8 +274,6 @@ public void saveQBittorrentServerValues() {
             editor.putString("data_timeout", data_timeout.getText().toString());
         }
 
-        editor.putBoolean("reverse_order" + currentServerValue, reverse_order.isChecked());
-
         editor.putBoolean("dark_ui" + currentServerValue, dark_ui.isChecked());
 
         // Commit changes
diff --git a/app/src/main/java/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java b/app/src/main/java/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java
index 56030d65..82096dc0 100644
--- a/app/src/main/java/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java
+++ b/app/src/main/java/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java
@@ -122,9 +122,8 @@ public void onRefresh() {
         }
 
         // Hide herderInfo and title in phone's view
-        if (getActivity().findViewById(R.id.one_frame) != null) {
+        if (getActivity().findViewById(R.id.one_frame) != null && MainActivity.headerInfo != null) {
             MainActivity.headerInfo.setVisibility(View.GONE);
-//            ((MainActivity) getActivity()).getSupportActionBar().setDisplayShowTitleEnabled(false);
 
             ((MainActivity) getActivity()).setTitle("");
             }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e7bd79c1..13e50f00 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -132,23 +132,6 @@
                 android:title="@string/settings_qbittorrent_notifications_period_title" />
         </PreferenceCategory>
 
-        <PreferenceCategory
-            android:key="sort"
-            android:title="@string/settings_qbittorrent_sort_category">
-            <ListPreference
-                android:defaultValue="@string/torrent_details_time_elapsed"
-                android:entries="@array/sortBy"
-                android:entryValues="@array/sortByValues"
-                android:key="sortby"
-                android:summary="@string/settings_qbittorrent_sortby_summary"
-                android:title="@string/settings_qbittorrent_sortby_dialog_title" />
-
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="reverse_order"
-                android:summary="@string/settings_qbittorrent_reverse_order_summary"
-                android:title="@string/settings_qbittorrent_reverse_order_dialog_title" />
-        </PreferenceCategory>
         <PreferenceCategory
             android:key="appearance"
             android:title="@string/settings_qbittorrent_appearance_category">