From 3f3ca820e5bb16d2b80e915237d860e4604af1c5 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 5 Oct 2018 20:55:53 +0200
Subject: [PATCH] Fix cleartext (non-ssl) http traffic on Android 9 though an
 explicit opt-in.

---
 app/src/main/AndroidManifest.xml                             | 3 ++-
 .../java/org/transdroid/daemon/Deluge/DelugeAdapter.java     | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d55663f2..be680f59 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
 		android:icon="@drawable/ic_launcher"
 		android:banner="@drawable/banner"
 		android:label="@string/app_name"
-		android:theme="@style/Theme.AppCompat" >
+		android:theme="@style/Theme.AppCompat"
+		android:usesCleartextTraffic="true">
 
 		<uses-library
 				android:name="org.apache.http.legacy"
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
index 0971b408..cc62339b 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
@@ -92,7 +92,6 @@ import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MAXUPLOAD;
 import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_MESSAGE;
 import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD;
 import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD;
-import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD_FILE;
 import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
 import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_AUTH_LOGIN;
 import static org.transdroid.daemon.Deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
@@ -145,7 +144,7 @@ public class DelugeAdapter implements IDaemonAdapter {
 	private static final String PATH_TO_UPLOAD = "/upload";
 
 	private static final String RPC_ID = "id";
-	private final String RPC_METHOD_ADD_FILE = "web.add_torrents";
+	private static final String RPC_METHOD_ADD_FILE = "web.add_torrents";
 
 	private DaemonSettings settings;
 	private DefaultHttpClient httpclient;
@@ -156,7 +155,7 @@ public class DelugeAdapter implements IDaemonAdapter {
 		this.settings = settings;
 	}
 
-	public JSONArray addTorrentByFile(String file, Log log) throws JSONException, IOException, DaemonException {
+	private JSONArray addTorrentByFile(String file, Log log) throws JSONException, IOException, DaemonException {
 
 		String url = buildWebUIUrl() + PATH_TO_UPLOAD;