Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Move to AndroidX

This commit is contained in:
tom79 2019-06-12 08:05:36 +02:00
parent c4b360ea83
commit a407dcc72d
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -4,7 +4,7 @@ android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig {
minSdkVersion 16
minSdkVersion 18
targetSdkVersion 28
versionCode 281
versionName "2.5.1"
@ -66,6 +66,7 @@ ext.ratethisappLibraryVersion = '1.2.0'
ext.uploadServiceVersion = "3.5.2"
ext.torrentstreamVersion = "2.5.0"
ext.netCipherVersion = "2.0.0-alpha1"
dependencies {
implementation 'androidx.appcompat:appcompat:1.0.2'
@ -105,4 +106,7 @@ dependencies {
playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
implementation 'ja.burhanrashid52:photoeditor:0.3.3'
implementation 'com.github.yalantis:ucrop:2.2.3'
implementation "info.guardianproject.netcipher:netcipher:$netCipherVersion"
implementation "info.guardianproject.netcipher:netcipher-okhttp3:$netCipherVersion"
}

55
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -128,6 +128,8 @@ import com.tonyodev.fetch2.Priority;
import com.tonyodev.fetch2.Request;
import com.tonyodev.fetch2core.DownloadBlock;
import net.gotev.uploadservice.UploadService;
import org.conscrypt.Conscrypt;
import org.jetbrains.annotations.NotNull;
@ -192,6 +194,10 @@ import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
import app.fedilab.android.sqlite.AccountDAO;
import app.fedilab.android.sqlite.Sqlite;
import info.guardianproject.netcipher.client.StrongBuilder;
import info.guardianproject.netcipher.client.StrongOkHttpClientBuilder;
import info.guardianproject.netcipher.proxy.OrbotHelper;
import okhttp3.OkHttpClient;
import static android.content.Context.DOWNLOAD_SERVICE;
import static com.koushikdutta.async.util.StreamUtility.copyStream;
@ -4005,4 +4011,53 @@ public class Helper {
return Uri.parse(path);
}
public static volatile boolean orbotConnected = false;
public static void initNetCipher(Context context) {
final String LOG_TAG = "NetCipherClient";
Log.i(LOG_TAG, "Initializing NetCipher client");
Context appContext = context.getApplicationContext();
if (!OrbotHelper.get(appContext).init()) {
orbotConnected = false;
appContext.startActivity(OrbotHelper.getOrbotInstallIntent(appContext));
return;
}
try {
StrongOkHttpClientBuilder.forMaxSecurity(appContext).build(new StrongBuilder.Callback<OkHttpClient>() {
@Override
public void onConnected(OkHttpClient okHttpClient) {
UploadService.HTTP_STACK = new OkHttpStack(okHttpClient);
orbotConnected = true;
Log.i("NetCipherClient", "Connection to orbot established!");
// from now on, you can create upload requests
// as usual, and they will be proxied through TOR.
// Bear in mind that
}
@Override
public void onConnectionException(Exception exc) {
orbotConnected = false;
Log.e("NetCipherClient", "onConnectionException()", exc);
}
@Override
public void onTimeout() {
orbotConnected = false;
Log.e("NetCipherClient", "onTimeout()");
}
@Override
public void onInvalid() {
orbotConnected = false;
Log.e("NetCipherClient", "onInvalid()");
}
});
} catch (Exception exc) {
Log.e("Error", "Error while initializing TOR Proxy OkHttpClient", exc);
}
}
}