Refactor and rewrite the OrbotConstants

guardianproject · Dec 14, 2024 · b2003b2 · b2003b2
1 parent ec62b32
commit b2003b2
Show file tree

Hide file tree

Showing 8 changed files with 212 additions and 196 deletions.
diff --git a/app/src/main/java/org/torproject/android/OrbotApp.kt b/app/src/main/java/org/torproject/android/OrbotApp.kt
@@ -1,15 +1,15 @@
 package org.torproject.android
 
 import android.app.Application
-import android.content.Intent
 import android.content.res.Configuration
+
 import org.torproject.android.core.Languages
 import org.torproject.android.core.LocaleHelper
-import org.torproject.android.service.OrbotConstants
 import org.torproject.android.service.util.Prefs
+
 import java.util.Locale
 
-class OrbotApp : Application(), OrbotConstants {
+class OrbotApp : Application() {
 
 
     override fun onCreate() {

diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.kt b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.kt
@@ -39,7 +39,7 @@ import org.torproject.android.service.vpn.TorifiedApp
 import java.util.Arrays
 import java.util.StringTokenizer
 
-class AppManagerActivity : AppCompatActivity(), View.OnClickListener, OrbotConstants {
+class AppManagerActivity : AppCompatActivity(), View.OnClickListener {
     inner class TorifiedAppWrapper {
         var header: String? = null
         var subheader: String? = null

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 apply from: "../commons.gradle"
 apply from : '../dependencies.gradle'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
     defaultConfig {
@@ -31,6 +32,9 @@ android {
         xmlReport false
     }
     namespace 'org.torproject.android.service'
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 dependencies {
@@ -52,4 +56,5 @@ dependencies {
     )
 
     implementation files('../libs/geoip.jar')
+    implementation 'androidx.core:core-ktx:1.10.1'
 }
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java