* Fixed issue #33 - glitch in tablet view

* Fixed issue # 30 - Swipe refresh in torrent details for tablets (free version) * Fixed "Authentication error" message when sending torrent and other scenarios
lgallard · Jun 25, 2015 · cc9da7d · cc9da7d
1 parent dc42080
commit cc9da7d
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 28 deletions.
diff --git a/qBittorrentClient/app/src/free/java/com/lgallardo/qbittorrentclient/MainActivity.java b/qBittorrentClient/app/src/free/java/com/lgallardo/qbittorrentclient/MainActivity.java
@@ -556,6 +556,28 @@ public void onResume() {
                 }
 
             }
+
+            if (fm.getBackStackEntryCount() == 0 && (fm.findFragmentByTag("secondFragment") instanceof TorrentDetailsFragment)) {
+
+                // Create the about fragment
+                aboutFragment = new AboutFragment();
+
+                fragmentTransaction.replace(R.id.content_frame, aboutFragment, "secondFragment");
+
+                fragmentTransaction.commit();
+
+                // Se titile
+                setTitle(navigationDrawerItemTitles[drawerList.getCheckedItemPosition()]);
+
+                // Close Contextual Action Bar
+                if (firstFragment != null && firstFragment.mActionMode != null) {
+                    firstFragment.mActionMode.finish();
+                }
+
+                // Refresh current list
+                refreshCurrent();
+
+            }
         }
         catch (Exception e) {
 
@@ -2171,6 +2193,8 @@ protected String doInBackground(String... params) {
 
             try {
 
+                httpStatusCode = 0;
+
                 jParser.postCommand(params[0], params[1]);
 
             } catch (JSONParserStatusCodeException e) {

diff --git a/qBittorrentClient/app/src/free/res/layout-large/torrent_details.xml b/qBittorrentClient/app/src/free/res/layout-large/torrent_details.xml
@@ -8,12 +8,11 @@
   Contributors:
       Luis M. Gallardo D. 
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:context=".TorrentActionsActivity">
+<android.support.v4.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/details_refresh_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -465,4 +464,4 @@
         </LinearLayout>
     </ScrollView>
 
-</LinearLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/qBittorrentClient/app/src/free/res/layout-large/torrent_details_old.xml b/qBittorrentClient/app/src/free/res/layout-large/torrent_details_old.xml
@@ -8,12 +8,12 @@
   Contributors:
       Luis M. Gallardo D. 
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:context=".TorrentActionsActivity">
+<android.support.v4.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/details_refresh_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -422,4 +422,4 @@
 
     </ScrollView>
 
-</LinearLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/qBittorrentClient/app/src/free/res/layout-sw600dp/torrent_details.xml b/qBittorrentClient/app/src/free/res/layout-sw600dp/torrent_details.xml
@@ -8,12 +8,12 @@
   Contributors:
       Luis M. Gallardo D. 
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:context=".TorrentActionsActivity">
+<android.support.v4.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/details_refresh_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -466,4 +466,4 @@
 
     </ScrollView>
 
-</LinearLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/qBittorrentClient/app/src/free/res/layout-sw600dp/torrent_details_old.xml b/qBittorrentClient/app/src/free/res/layout-sw600dp/torrent_details_old.xml
@@ -8,12 +8,12 @@
   Contributors:
       Luis M. Gallardo D. 
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:context=".TorrentActionsActivity">
+<android.support.v4.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/details_refresh_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -422,4 +422,4 @@
 
     </ScrollView>
 
-</LinearLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/qBittorrentClient/app/src/pro/java/com.lgallardo.qbittorrentclient/MainActivity.java b/qBittorrentClient/app/src/pro/java/com.lgallardo.qbittorrentclient/MainActivity.java
@@ -552,6 +552,28 @@ public void onResume() {
                 }
 
             }
+            if (fm.getBackStackEntryCount() == 0 && (fm.findFragmentByTag("secondFragment") instanceof TorrentDetailsFragment)) {
+
+                // Create the about fragment
+                aboutFragment = new AboutFragment();
+
+                fragmentTransaction.replace(R.id.content_frame, aboutFragment, "secondFragment");
+
+                fragmentTransaction.commit();
+
+                // Se titile
+                setTitle(navigationDrawerItemTitles[drawerList.getCheckedItemPosition()]);
+
+                // Close Contextual Action Bar
+                if (firstFragment != null && firstFragment.mActionMode != null) {
+                    firstFragment.mActionMode.finish();
+                }
+
+                // Refresh current list
+                refreshCurrent();
+
+            }
+
         }
         catch (Exception e) {
 
@@ -2161,6 +2183,8 @@ protected String doInBackground(String... params) {
 
             try {
 
+                httpStatusCode = 0;
+
                 jParser.postCommand(params[0], params[1]);
 
             } catch (JSONParserStatusCodeException e) {