many small changes to support new binary loading, startup and more

- improved handling of port conflicts
- fixed loading of tor binary on arm64-v8a
- changed how we execute shell commands

Author: n8fr8

app/build.gradle

@@ -34,8 +34,8 @@ android {
             minSdkVersion 16
             applicationId 'org.torproject.android'
             targetSdkVersion 28
-            versionCode 16060001
-            versionName '16.0.6-BETA-1-tor-0.3.5.8'
+            versionCode 16060002
+            versionName '16.0.6-BETA-2-tor-0.3.5.8'
             archivesBaseName = "Orbot-$versionName"
         }
     }
@@ -55,7 +55,7 @@ android {
             reset()
 
             // Specifies a list of ABIs that Gradle should create APKs for.
-            include "x86", "armeabi", "armeabi-v7a"
+            include "x86", "armeabi", "armeabi-v7a", "x86_64", "arm64-v8a"
 
             // Specifies that we do not want to also generate a universal APK that includes all ABIs.
             universalApk true

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.torproject.android"
-    android:installLocation="auto">
+    android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -30,7 +30,7 @@
         >
         <activity
             android:name=".OrbotMainActivity"
-            android:excludeFromRecents="true"
+            android:excludeFromRecents="false"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

jsocksAndroid/src/main/AndroidManifest.xml

@@ -1,11 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.jsocksandroid"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="21" />
+    package="com.example.jsocksandroid" >
 
 
 </manifest>

orbotservice/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     sourceSets {
         main {
@@ -12,9 +12,10 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 28
+        versionCode 16060001
+        versionName '16.0.6-BETA-1-tor-0.3.5.8-orbotservice'
+        archivesBaseName = "OrbotService-$versionName"
 
     }
     buildTypes {
@@ -27,9 +28,11 @@ android {
 
 dependencies {
     implementation project(':jsocksAndroid')
-    implementation 'org.torproject:tor-android-binary:0.3.5.8-rc'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.jrummyapps:android-shell:1.0.1'
+    implementation 'org.torproject:tor-android-binary:0.3.5.8-rc-v2'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.jaredrummler:android-shell:1.0.0'
     implementation fileTree(dir: 'libs', include: ['.so'])
     testImplementation 'junit:junit:4.12'
+
+    implementation 'com.offbynull.portmapper:portmapper:2.0.5'
 }