From fe6a0e47121d17d08c7d913f1db086687a569446 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Wed, 23 Jun 2021 03:27:17 +0200 Subject: initial tor-integration to circumvent blocking attempts of the provider api --- app/build.gradle | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index f1331e12..7f4f667e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -391,6 +391,9 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'de.hdodenhof:circleimageview:3.1.0' + implementation 'info.guardianproject:tor-android:0.4.5.7' + implementation 'info.guardianproject:jtorctl:0.4.5.7' + fatwebImplementation project(path: ':bitmask-web-core') fatImplementation project(path: ':bitmask-core') x86Implementation project(path: ':bitmask-core') -- cgit v1.2.3 From cdefcb0d109d4558d5b9531bde2178a8b9bad0dc Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 9 Jul 2021 04:56:56 +0200 Subject: use bitmaskcore libs in android project --- app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 7f4f667e..87c28be2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -394,12 +394,12 @@ dependencies { implementation 'info.guardianproject:tor-android:0.4.5.7' implementation 'info.guardianproject:jtorctl:0.4.5.7' - fatwebImplementation project(path: ':bitmask-web-core') - fatImplementation project(path: ':bitmask-core') - x86Implementation project(path: ':bitmask-core') - x86_64Implementation project(path: ':bitmask-core') - armv7Implementation project(path: ':bitmask-core') - arm64Implementation project(path: ':bitmask-core') + fatwebImplementation project(path: ':lib-bitmask-core-web') + fatImplementation project(path: ':lib-bitmask-core') + x86Implementation project(path: ':lib-bitmask-core-x86') + x86_64Implementation project(path: ':lib-bitmask-core-x86_64') + armv7Implementation project(path: ':lib-bitmask-core-armv7') + arm64Implementation project(path: ':lib-bitmask-core-arm64') } android.applicationVariants.all { variant -> -- cgit v1.2.3 From 6a3b5094cbc347bc9119214f8ea074ce53452cdb Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sun, 11 Jul 2021 16:31:30 +0200 Subject: inject IPtProxy in TorService --- app/build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 87c28be2..e436df38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -250,6 +250,7 @@ android { ] jniLibs.srcDirs = ['../ics-openvpn/main/build/intermediates/cmake/skeletonRelease/obj/'] jni.srcDirs = [] //disable automatic ndk-build + } debug { assets.srcDirs = ['src/debug/assets', @@ -391,8 +392,11 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'de.hdodenhof:circleimageview:3.1.0' - implementation 'info.guardianproject:tor-android:0.4.5.7' - implementation 'info.guardianproject:jtorctl:0.4.5.7' + + + //implementation 'info.guardianproject:tor-android:0.4.5.7' + //implementation 'info.guardianproject:jtorctl:0.4.5.7' + implementation project(path: ':tor-android:tor-android-binary') fatwebImplementation project(path: ':lib-bitmask-core-web') fatImplementation project(path: ':lib-bitmask-core') -- cgit v1.2.3 From 8d94a1107c73a964e00859f58098019751b433bd Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 12 Jul 2021 19:37:21 +0200 Subject: ensure fronts file will be included in all builds --- app/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index e436df38..baad211a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -230,6 +230,9 @@ android { applicationIdSuffix ".beta" appSuffix = " Beta" buildConfigField "Boolean", "DEBUG_MODE", "true" + + // tor-android doesn't know this build-type, fallback to release in that case + matchingFallbacks = ['release'] } debug { testCoverageEnabled = true @@ -445,7 +448,8 @@ android.applicationVariants.all { variant -> 'urls/', '*.url', '*.json', - '*.pem']) + '*.pem', + 'fronts']) delete(filesToDelete) } } -- cgit v1.2.3 From f2f4d340ea2276c5e88e9451554c56f92ab616d4 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 15 Jul 2021 13:31:12 +0200 Subject: set required ndk version in build.gradle --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index baad211a..9e1d4d7b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,6 +5,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 + ndkVersion "21.4.7075529" compileOptions { targetCompatibility 1.8 -- cgit v1.2.3