Merge pull request #625 from bwitt/qbittorrent-show-all-categories

Show all categories on qBittorrent >= 4.1

app/build.gradle

@@ -64,9 +64,6 @@ android {
         }
     }
 
-    lintOptions {
-        disable 'MissingTranslation', 'ExtraTranslation', 'StringFormatInvalid', 'ValidFragment', 'Registered'
-    }
 
     compileOptions {
         encoding = 'UTF-8'
@@ -75,6 +72,10 @@ android {
     }
 
     useLibrary 'org.apache.http.legacy'
+    lint {
+        disable 'MissingTranslation', 'ExtraTranslation', 'StringFormatInvalid', 'ValidFragment', 'Registered'
+    }
+    namespace 'org.transdroid'
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -15,8 +15,7 @@
   along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.transdroid">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk />
 
@@ -52,7 +51,7 @@
     </queries>
 
     <application
-        android:name=".core.gui.TransdroidApp_"
+        android:name="org.transdroid.core.gui.TransdroidApp_"
         android:allowBackup="true"
         android:banner="@drawable/banner"
         android:hardwareAccelerated="true"

app/src/main/java/org/transdroid/daemon/Torrent.java

@@ -359,7 +359,7 @@ public final class Torrent implements Parcelable, Comparable<Torrent>, Finishabl
      */
     public boolean canPause() {
         // Can pause when it is downloading or seeding
-        return statusCode == TorrentStatus.Downloading || statusCode == TorrentStatus.Seeding;
+        return statusCode == TorrentStatus.Downloading || statusCode == TorrentStatus.Seeding || statusCode == TorrentStatus.Queued;
     }
 
     /**

app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java

@@ -1,4 +1,4 @@
-/*
+/*
  *	This file is part of Transdroid <http://www.transdroid.org>
  *
  *	Transdroid is free software: you can redistribute it and/or modify
@@ -163,14 +163,14 @@ public class BitCometAdapter implements IDaemonAdapter {
 
                     // Request to add a torrent by URL
                     String url = ((AddByUrlTask) task).getUrl();
-                    makeUploadUrlRequest(log, "/panel/task_add_httpftp_result", url);
+                    makeUploadUrlRequest(log, "/panel/task_add_magnet_result", url);
                     return new DaemonTaskSuccessResult(task);
 
                 case AddByMagnetUrl:
 
                     // Request to add a torrent by URL
                     String magnetUrl = ((AddByMagnetUrlTask) task).getUrl();
-                    makeUploadUrlRequest(log, "/panel/task_add_httpftp_result", magnetUrl);
+                    makeUploadUrlRequest(log, "/panel/task_add_magnet_result", magnetUrl);
                     return new DaemonTaskSuccessResult(task);
 
                 case Remove:

app/src/main/java/org/transdroid/daemon/adapters/qBittorrent/QBittorrentAdapter.java

@@ -234,9 +234,17 @@ public class QBittorrentAdapter implements IDaemonAdapter {
                         path = "/json/events";
                     }
 
-                    JSONArray result = new JSONArray(makeRequest(log, path));
+                    JSONArray allTorrentsResult = new JSONArray(makeRequest(log, path));
+                    final List<Torrent> torrentsList = parseJsonTorrents(allTorrentsResult);
 
-                    return new RetrieveTaskSuccessResult((RetrieveTask) task, parseJsonTorrents(result), parseJsonLabels(result));
+                    JSONArray allLabelsResult;
+                    if (version >= 40100) {
+                        allLabelsResult = new JSONObject(makeRequest(log, "/api/v2/torrents/categories")).names();
+                    } else {
+                        allLabelsResult = new JSONArray();
+                    }
+                    final List<Label> labelList = parseJsonLabels(allLabelsResult, allTorrentsResult);
+                    return new RetrieveTaskSuccessResult((RetrieveTask) task, torrentsList, labelList);
 
                 case GetTorrentDetails:
 
@@ -469,8 +477,8 @@ public class QBittorrentAdapter implements IDaemonAdapter {
                     String ul = (ratesTask.getUploadRate() == null ? "NaN" : Long.toString(ratesTask.getUploadRate() * 1024));
 
                     if (version >= 40100) {
-                        pathDL = "/api/v2/torrents/setDownloadLimit";
-                        pathUL = "/api/v2/torrents/setUploadLimit";
+                        pathDL = "/api/v2/transfer/setDownloadLimit";
+                        pathUL = "/api/v2/transfer/setUploadLimit";
                     } else {
                         pathDL = "/command/setGlobalDlLimit";
                         pathUL = "/command/setGlobalUpLimit";
@@ -648,18 +656,25 @@ public class QBittorrentAdapter implements IDaemonAdapter {
 
     }
 
-    private List<Label> parseJsonLabels(JSONArray response) throws JSONException {
+    private List<Label> parseJsonLabels(JSONArray allLabelsResponse, JSONArray allTorrentsResponse) throws JSONException {
 
-        // Collect used labels from response
+        // Collect used labels from torrents response
         Map<String, Label> labels = new HashMap<>();
-        for (int i = 0; i < response.length(); i++) {
-            JSONObject tor = response.getJSONObject(i);
+        for (int i = 0; i < allTorrentsResponse.length(); i++) {
+            JSONObject tor = allTorrentsResponse.getJSONObject(i);
             if (tor.has("category")) {
                 String label = tor.optString("category");
                 final Label labelObject = labels.get(label);
                 labels.put(label, new Label(label, (labelObject != null) ? labelObject.getCount() + 1 : 1));
             }
         }
+        // add unused labels
+        for (int i = 0; i < allLabelsResponse.length(); i++) {
+            String label = allLabelsResponse.getString(i);
+            if (!labels.containsKey(label)) {
+                labels.put(label, new Label(label, 0));
+            }
+        }
         return new ArrayList<>(labels.values());
 
     }

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists