Merge branch 'orbot-kt-modularization' of https://github.com/bitmold/…

…orbot into bitmold-orbot-kt-modularization
guardianproject · Sep 11, 2020 · 9142dfd · 9142dfd
2 parents bf584cc + 64692ff
commit 9142dfd
Show file tree

Hide file tree

Showing 59 changed files with 1,017 additions and 2,350 deletions.
diff --git a/app-mini/build.gradle b/app-mini/build.gradle
@@ -109,8 +109,12 @@ dependencies {
     implementation project(':orbotservice')
     implementation 'com.github.apl-devs:appintro:v4.2.2'
     implementation 'androidx.palette:palette:1.0.0'
-    implementation 'com.github.javiersantos:AppUpdater:2.7'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation project(path: ':appcore')
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation project(path: ':intentintegrator')
     androidTestImplementation "tools.fastlane:screengrab:1.2.0"
 }
 

diff --git a/app-mini/src/debug/AndroidManifest.xml b/app-mini/src/debug/AndroidManifest.xml
@@ -72,7 +72,7 @@
             android:exported="false"
             android:label="@string/app_name" />
         <activity
-            android:name=".settings.SettingsPreferences"
+            android:name=".settings.SettingsPreferencesActivity"
             android:label="@string/app_name" />
         <activity
             android:name=".ui.AppManagerActivity"

diff --git a/app-mini/src/main/AndroidManifest.xml b/app-mini/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
             android:stateNotNeeded="true"
             android:theme="@android:style/Theme.Translucent" />
         <activity
-            android:name=".settings.SettingsPreferences"
+            android:name="org.torproject.android.core.ui.SettingsPreferencesActivity"
             android:label="@string/app_name" />
         <activity
             android:name=".ui.AppManagerActivity"
@@ -61,36 +61,11 @@
         <activity android:name=".ui.onboarding.OnboardingActivity" />
 
 
-        <receiver
-            android:name=".OnBootReceiver"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-
-                <category android:name="android.intent.category.HOME" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-
-                <category android:name="android.intent.category.HOME" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_MOUNTED" />
-
-                <category android:name="android.intent.category.HOME" />
-            </intent-filter>
-        </receiver>
-
         <service
             android:name="org.torproject.android.service.OrbotService"
             android:enabled="true"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:stopWithTask="false" />
-        <service
-            android:name="org.torproject.android.service.vpn.TorVpnService"
-            android:enabled="true"
-            android:permission="android.permission.BIND_VPN_SERVICE">
+            android:stopWithTask="false">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>