Got android build working again

getlantern · Oct 11, 2023 · c863b52 · c863b52
1 parent 86a840e
commit c863b52
Show file tree

Hide file tree

Showing 13 changed files with 173 additions and 168 deletions.
diff --git a/Makefile b/Makefile
@@ -18,6 +18,9 @@ lib/messaging/protos_flutteronly/messaging.pb.dart: protos_flutteronly/messaging
 lib/vpn/protos_shared/vpn.pb.dart: protos_shared/vpn.proto
 	@protoc --dart_out=./lib/vpn --plugin=protoc-gen-dart=$$HOME/.pub-cache/bin/protoc-gen-dart protos_shared/vpn.proto
 
+internalsdk/protos/vpn.pb.go: protos_shared/vpn.proto
+	@protoc --go_out=internalsdk protos_shared/vpn.proto
+
 # Compiles autorouter routes
 routes: lib/core/router/router.gr.dart
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -243,7 +243,7 @@ android {
         main {
             jniLibs.srcDirs = ['libs']
             java.srcDirs += 'src/main/kotlin'
-            proto.srcDirs += '../../protos_shared'
+             proto.srcDirs += '../../protos_shared'
         }
     }
 

diff --git a/android/app/libs/liblantern-all.aar b/android/app/libs/liblantern-all.aar
diff --git a/android/app/src/main/java/org/getlantern/mobilesdk/model/SessionManager.kt b/android/app/src/main/java/org/getlantern/mobilesdk/model/SessionManager.kt
@@ -474,7 +474,7 @@ abstract class SessionManager(application: Application) : Session {
     }
 
     // isPlayVersion checks whether or not the user installed Lantern via the Google Play store
-    override fun isPlayVersion(): Boolean {
+    override fun isStoreVersion(): Boolean {
         if (BuildConfig.PLAY_VERSION || prefs.getBoolean(PLAY_VERSION, false)) {
             return true
         }
@@ -577,7 +577,7 @@ abstract class SessionManager(application: Application) : Session {
         prefs = prefsAdapter
         prefs.edit().putBoolean(DEVELOPMENT_MODE, BuildConfig.DEVELOPMENT_MODE)
             .putBoolean(PAYMENT_TEST_MODE, prefs.getBoolean(PAYMENT_TEST_MODE, false))
-            .putBoolean(PLAY_VERSION, isPlayVersion())
+            .putBoolean(PLAY_VERSION, isStoreVersion())
             .putString(FORCE_COUNTRY, prefs.getString(FORCE_COUNTRY, "")).apply()
 
         // initialize email address to empty string (if it doesn't already exist)

diff --git a/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt b/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt
@@ -195,7 +195,7 @@ class SessionModel(
             }
 
             "setPlayVersion" -> {
-                LanternApp.getSession().isPlayVersion = call.argument("on") ?: false
+                LanternApp.getSession().isStoreVersion = call.argument("on") ?: false
                 activity.restartApp()
             }
 
@@ -399,7 +399,7 @@ class SessionModel(
 
     private fun checkEmailExists(emailAddress: String, methodCallResult: MethodChannel.Result) {
         val params = mapOf("email" to emailAddress)
-        val isPlayVersion = LanternApp.getSession().isPlayVersion()
+        val isPlayVersion = LanternApp.getSession().isStoreVersion()
         val useStripe = !isPlayVersion
         lanternClient.get(
             LanternHttpClient.createProUrl("/email-exists", params),

diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt b/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt
@@ -49,7 +49,7 @@ open class LanternApp : Application() {
 
         LanternProxySelector(session)
 
-        if (session.isPlayVersion) inAppBilling = InAppBilling(this)
+        if (session.isStoreVersion) inAppBilling = InAppBilling(this)
 
         lanternHttpClient = LanternHttpClient()
 
@@ -98,7 +98,7 @@ open class LanternApp : Application() {
         fun getPlans(cb: LanternHttpClient.PlansCallback) {
             lanternHttpClient.getPlans(
                 cb,
-                if (session.isPlayVersion && !session.isRussianUser) inAppBilling else null
+                if (session.isStoreVersion && !session.isRussianUser) inAppBilling else null
             )
         }
 

diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt
@@ -338,8 +338,8 @@ class LanternSessionManager(application: Application) : SessionManager(applicati
         }
     }
 
-    fun setPlayVersion(playVersion: Boolean) {
-        prefs.edit().putBoolean(PLAY_VERSION, playVersion).apply()
+    fun setStoreVersion(storeVersion: Boolean) {
+        prefs.edit().putBoolean(PLAY_VERSION, storeVersion).apply()
     }
 
     companion object {

diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/AutoUpdater.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/AutoUpdater.kt
@@ -45,7 +45,7 @@ class AutoUpdater(val context: Context, val activity: Activity? = null) {
     }
 
     fun checkForUpdates() {
-        if (LanternApp.getSession().isPlayVersion && activity != null) {
+        if (LanternApp.getSession().isStoreVersion && activity != null) {
             Utils.openPlayStore(context)
             return
         }

diff --git a/internalsdk/messaging_model.go b/internalsdk/messaging_model.go
@@ -31,7 +31,7 @@ func (s *MessagingModel) InvokeMethod(method string, arguments Arguments) (*mini
 
 func initMessagingModel(m *baseModel) error {
 	pathdb.Mutate(m.db, func(tx pathdb.TX) error {
-		pathdb.Put[bool](tx, ONBOARDING_STATUS, false, "")
+		pathdb.Put(tx, ONBOARDING_STATUS, false, "")
 		return nil
 	})
 	return nil