Browse Source

merged with erickok/master

pull/313/head
Twig Nguyen 8 years ago
parent
commit
7b29ab952a
  1. 2
      README.md
  2. 10
      app/build.gradle
  3. 3
      app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
  4. 1
      app/src/main/res/layout/actionbar_serverstatus.xml
  5. 4
      app/src/main/res/values-land/dimens.xml
  6. 4
      app/src/main/res/values-sw600dp/dimens.xml
  7. 3
      app/src/main/res/values/changelog.xml
  8. 4
      app/src/main/res/values/dimens.xml
  9. 2
      build.gradle
  10. 4
      gradle/wrapper/gradle-wrapper.properties
  11. 2
      latest-app.html
  12. 2
      latest-search.html

2
README.md

@ -30,7 +30,7 @@ Designed and developed by [Eric Kok](eric@2312.nl) of [2312 development](http:// @@ -30,7 +30,7 @@ Designed and developed by [Eric Kok](eric@2312.nl) of [2312 development](http://
License
=======
Copyright 2010-2014 Eric Kok et al.
Copyright 2010-2017 Eric Kok et al.
Transdroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

10
app/build.gradle

@ -2,15 +2,15 @@ apply plugin: 'com.android.application' @@ -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 {

3
app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java

@ -71,7 +71,6 @@ import java.io.FileNotFoundException; @@ -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 { @@ -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 { @@ -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);

1
app/src/main/res/layout/actionbar_serverstatus.xml

@ -19,6 +19,7 @@ @@ -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">
<View

4
app/src/main/res/values-land/dimens.xml

@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
<dimen name="ui_serverstatus_signmargin">2dp</dimen>
<dimen name="ui_serverstatus_bignumber">19sp</dimen>
<dimen name="ui_serverstatus_sign">12dp</dimen>
<dimen name="ui_serverstatus_smallnumber">12dp</dimen>
<dimen name="ui_serverstatus_width">56dp</dimen>
<dimen name="ui_serverstatus_smallnumber">12sp</dimen>
<dimen name="ui_serverstatus_width">60dp</dimen>
</resources>

4
app/src/main/res/values-sw600dp/dimens.xml

@ -32,8 +32,8 @@ @@ -32,8 +32,8 @@
<dimen name="ui_serverstatus_signmargin">5dp</dimen>
<dimen name="ui_serverstatus_bignumber">25sp</dimen>
<dimen name="ui_serverstatus_sign">17dp</dimen>
<dimen name="ui_serverstatus_smallnumber">14dp</dimen>
<dimen name="ui_serverstatus_width">67dp</dimen>
<dimen name="ui_serverstatus_smallnumber">14sp</dimen>
<dimen name="ui_serverstatus_width">70dp</dimen>
<!-- Widget configuration -->
<integer name="widget_config_orientation">0</integer>

3
app/src/main/res/values/changelog.xml

@ -17,6 +17,9 @@ @@ -17,6 +17,9 @@
-->
<resources>
<string name="system_changelog">
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

4
app/src/main/res/values/dimens.xml

@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
<dimen name="ui_serverstatus_signmargin">3dp</dimen>
<dimen name="ui_serverstatus_bignumber">21sp</dimen>
<dimen name="ui_serverstatus_sign">17dp</dimen>
<dimen name="ui_serverstatus_smallnumber">13dp</dimen>
<dimen name="ui_serverstatus_width">56dp</dimen>
<dimen name="ui_serverstatus_smallnumber">13sp</dimen>
<dimen name="ui_serverstatus_width">60dp</dimen>
<dimen name="ui_bignumber_size">20sp</dimen>
<dimen name="ui_bignumber_padding">2dp</dimen>

2
build.gradle

@ -3,7 +3,7 @@ buildscript { @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}

4
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#Wed Jan 20 12:20:00 CET 2016
#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.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

2
latest-app.html

@ -1 +1 @@ @@ -1 +1 @@
227|2.5.7
228|2.5.8

2
latest-search.html

@ -1 +1 @@ @@ -1 +1 @@
28|3.5
30|3.7

Loading…
Cancel
Save