From 90942ce1de39ffbff874e78aad0b69b0810bc2a3 Mon Sep 17 00:00:00 2001 From: Petko Vasilev Date: Sat, 22 Oct 2016 16:36:26 +0300 Subject: [PATCH 1/5] Fixed a minor visual glitch in the serverstatus actionbar --- app/src/main/res/layout/actionbar_serverstatus.xml | 1 + app/src/main/res/values-land/dimens.xml | 2 +- app/src/main/res/values-sw600dp/dimens.xml | 2 +- app/src/main/res/values/dimens.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/actionbar_serverstatus.xml b/app/src/main/res/layout/actionbar_serverstatus.xml index 182dcf57..39306c6d 100644 --- a/app/src/main/res/layout/actionbar_serverstatus.xml +++ b/app/src/main/res/layout/actionbar_serverstatus.xml @@ -19,6 +19,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" + tools:background="@android:color/white" android:orientation="horizontal"> 19sp 12dp 12dp - 56dp + 60dp diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index fdf0ec32..0f5c2939 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -33,7 +33,7 @@ 25sp 17dp 14dp - 67dp + 70dp 0 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c2223290..3523159d 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -41,7 +41,7 @@ 21sp 17dp 13dp - 56dp + 60dp 20sp 2dp From a65778ed97519e9ca8d2c9c700271a320ad54da6 Mon Sep 17 00:00:00 2001 From: Petko Vasilev Date: Sat, 22 Oct 2016 16:38:56 +0300 Subject: [PATCH 2/5] Changed a text dimen from dp to sp --- app/src/main/res/values-land/dimens.xml | 2 +- app/src/main/res/values-sw600dp/dimens.xml | 2 +- app/src/main/res/values/dimens.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 2686b0bc..df364fc7 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -23,7 +23,7 @@ 2dp 19sp 12dp - 12dp + 12sp 60dp diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index 0f5c2939..d94962ad 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -32,7 +32,7 @@ 5dp 25sp 17dp - 14dp + 14sp 70dp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 3523159d..154854f0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -40,7 +40,7 @@ 3dp 21sp 17dp - 13dp + 13sp 60dp 20sp 2dp From 7a866cd7cedfeca48992fe502cc09eaf2871b443 Mon Sep 17 00:00:00 2001 From: Annie the Eagle Date: Tue, 7 Mar 2017 21:58:43 +0000 Subject: [PATCH 3/5] Issue #355 - Fix compatibility with latest Deluge. Also upgrade Gradle. --- .../main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java | 3 ++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) 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 ceb9688e..da39ecf5 100644 --- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java +++ b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java @@ -71,7 +71,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.net.URLDecoder; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -523,6 +522,7 @@ public class DelugeAdapter implements IDaemonAdapter { // Set POST URL and data HttpPost httppost = new HttpPost(buildWebUIUrl() + PATH_TO_RPC); + httppost.setHeader("content-type", "application/json"); StringEntity se = new StringEntity(loginRequest.toString()); httppost.setEntity(se); @@ -554,6 +554,7 @@ public class DelugeAdapter implements IDaemonAdapter { // Set POST URL and data HttpPost httppost = new HttpPost(buildWebUIUrl() + PATH_TO_RPC); + httppost.setHeader("content-type", "application/json"); StringEntity se = new StringEntity(data.toString()); httppost.setEntity(se); diff --git a/build.gradle b/build.gradle index 5657e594..86d687a9 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.2.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2890231d..1b7cccdb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 20 12:20:00 CET 2016 +#Tue Mar 07 21:09:46 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip From 5d8de8a1981b73f553476b632ed6bf255f11d62d Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 17 Mar 2017 17:06:12 +0100 Subject: [PATCH 4/5] Bumb version for 2.5.8 release with Deluge fix. --- app/build.gradle | 10 +++++----- app/src/main/res/values/changelog.xml | 3 +++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a4e7e0fe..bba01c3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'com.android.application' apply plugin: 'android-apt' android { - compileSdkVersion 23 - buildToolsVersion '23.0.3' + compileSdkVersion 25 + buildToolsVersion '25.0.2' useLibrary 'org.apache.http.legacy' defaultConfig { minSdkVersion 15 - targetSdkVersion 23 - versionCode 227 - versionName '2.5.7' + targetSdkVersion 25 + versionCode 228 + versionName '2.5.8' } buildTypes { release { diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml index 3abf5c6f..8cbf48d9 100644 --- a/app/src/main/res/values/changelog.xml +++ b/app/src/main/res/values/changelog.xml @@ -17,6 +17,9 @@ --> +Transdroid 2.5.8\n +- Deluge 1.3.14+ fix\n +\n Transdroid 2.5.7\n - Runtime permission request bugfix\n - Fixed icons in RSS screen\n diff --git a/build.gradle b/build.gradle index 86d687a9..6944a5dc 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b7cccdb..a7dfde21 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 07 21:09:46 GMT 2017 +#Wed Mar 15 09:19:02 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From d1ecd52bfc33ae3f0c8aeb857a0251595ca014a0 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 17 Mar 2017 17:10:28 +0100 Subject: [PATCH 5/5] Updated to point to 2.5.8 as latest version. --- latest-app.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest-app.html b/latest-app.html index 9f652803..f2a669eb 100644 --- a/latest-app.html +++ b/latest-app.html @@ -1 +1 @@ -227|2.5.7 +228|2.5.8