commit 0bb30b64417fa0789edc6b8d9d8ff6c684a42a78 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Wed Nov 14 17:36:53 2018 +0000

Bug 28051 - Integrate Orbot and add dependencies --- build.gradle | 4 ++++ mobile/android/app/build.gradle | 11 +++++++++++ mobile/android/base/AndroidManifest.xml.in | 1 + mobile/android/config/proguard/proguard.cfg | 13 +++++++++++++ 4 files changed, 29 insertions(+)

diff --git a/build.gradle b/build.gradle index a080e15b2fac..6cf2d4cc0e7a 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,10 @@ allprojects { url repository } } + // These are needed for Orbot's dependencies + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + maven { url 'https://jitpack.io' } + jcenter() } }

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 7c515bbe65a7..d0060901b6b3 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -225,6 +225,9 @@ dependencies { implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" + implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar') + implementation files('orbotservice-release.aar') + implementation files('jsocksAndroid-release.aar')

if (mozconfig.substs.MOZ_NATIVE_DEVICES) { implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}" @@ -262,6 +265,14 @@ dependencies {

// Including the Robotium JAR directly can cause issues with dexing. androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4' + + // Orbot + implementation 'com.github.delight-im:Android-Languages:v1.0.1' + implementation 'pl.bclogic:pulsator4droid:1.0.3' + + // Orbotservice + implementation 'org.torproject:tor-android-binary:0.3.4.9' + implementation 'com.jrummyapps:android-shell:1.0.1' }

// TODO: (bug 1261486): This impl is not robust - diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index c4ea9a37683e..0e5f4edaf814 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -24,6 +24,7 @@ #include FennecManifest_permissions.xml.in

<application android:label="@string/moz_app_displayname" + tools:replace="android:label" android:icon="@drawable/icon" android:logo="@drawable/logo" android:name="@MOZ_ANDROID_APPLICATION_CLASS@" diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg index 0be8a745e44b..5d94788a18af 100644 --- a/mobile/android/config/proguard/proguard.cfg +++ b/mobile/android/config/proguard/proguard.cfg @@ -165,6 +165,19 @@ # See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-icu... -dontnote android.support.**

+# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META-... +# JSR 305 annotations are for embedding nullability information. +-dontwarn javax.annotation.** + +# A resource is loaded with a relative path so the package of this class must be preserved. +-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase + +# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. +-dontwarn org.codehaus.mojo.animal_sniffer.* + +# OkHttp platform used only on JVM and when Conscrypt dependency is available. +-dontwarn okhttp3.internal.platform.ConscryptPlatform + -include "adjust-keeps.cfg"

-include "leakcanary-keeps.cfg"