Browse Source

Replace local iharder Base64 with library

pull/554/head
TacoTheDank 4 years ago
parent
commit
0d4a4d30db
  1. 1
      app/build.gradle
  2. 1998
      app/src/main/java/org/base64/android/Base64.java
  3. 2
      app/src/main/java/org/transdroid/daemon/Aria2c/Aria2Adapter.java
  4. 2
      app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java
  5. 6
      app/src/main/java/org/transdroid/daemon/Transmission/TransmissionAdapter.java
  6. 2
      app/src/main/java/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java

1
app/build.gradle

@ -91,6 +91,7 @@ dependencies {
implementation 'com.nispok:snackbar:2.11.0' implementation 'com.nispok:snackbar:2.11.0'
implementation 'com.github.aegnor:rencode-java:cb628e824e' implementation 'com.github.aegnor:rencode-java:cb628e824e'
implementation 'org.apache.openjpa:openjpa-lib:3.1.1' implementation 'org.apache.openjpa:openjpa-lib:3.1.1'
implementation 'net.iharder:base64:2.3.9'
implementation('com.github.afollestad.material-dialogs:core:0.9.6.0@aar') { implementation('com.github.afollestad.material-dialogs:core:0.9.6.0@aar') {
transitive = true transitive = true
} }

1998
app/src/main/java/org/base64/android/Base64.java

File diff suppressed because it is too large Load Diff

2
app/src/main/java/org/transdroid/daemon/Aria2c/Aria2Adapter.java

@ -25,7 +25,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity; import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
import org.base64.android.Base64; import net.iharder.Base64;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;

2
app/src/main/java/org/transdroid/daemon/Deluge/DelugeRpcAdapter.java

@ -18,7 +18,7 @@
package org.transdroid.daemon.Deluge; package org.transdroid.daemon.Deluge;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.base64.android.Base64; import net.iharder.Base64;
import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.log.Log;
import org.transdroid.core.gui.remoterss.data.RemoteRssChannel; import org.transdroid.core.gui.remoterss.data.RemoteRssChannel;
import org.transdroid.core.gui.remoterss.data.RemoteRssItem; import org.transdroid.core.gui.remoterss.data.RemoteRssItem;

6
app/src/main/java/org/transdroid/daemon/Transmission/TransmissionAdapter.java

@ -22,8 +22,8 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity; import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
import org.base64.android.Base64; import net.iharder.Base64;
import org.base64.android.Base64.InputStream; import net.iharder.Base64.InputStream;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -192,7 +192,7 @@ public class TransmissionAdapter implements IDaemonAdapter {
// Encode the .torrent file's data // Encode the .torrent file's data
InputStream in = InputStream in =
new Base64.InputStream(new FileInputStream(new File(URI.create(file))), Base64.ENCODE); new InputStream(new FileInputStream(new File(URI.create(file))), Base64.ENCODE);
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
int c; int c;
while ((c = in.read()) != -1) { while ((c = in.read()) != -1) {

2
app/src/main/java/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java

@ -43,7 +43,7 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams; import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams; import org.apache.http.params.HttpProtocolParams;
import org.base64.android.Base64; import net.iharder.Base64;
import org.transdroid.daemon.DaemonException; import org.transdroid.daemon.DaemonException;
import org.transdroid.daemon.DaemonSettings; import org.transdroid.daemon.DaemonSettings;
import org.transdroid.daemon.DaemonException.ExceptionType; import org.transdroid.daemon.DaemonException.ExceptionType;

Loading…
Cancel
Save