Merge branch '3.91' into 'develop'

updated to v3.91

See merge request ws/client/androidapp!332

Author: Ginder-Singh

base/src/main/java/com/windscribe/vpn/apppreference/AppPreferenceHelper.kt

@@ -44,8 +44,12 @@ class AppPreferenceHelper(
     private val securePreferences: SecurePreferences
 ) : PreferencesHelper {
     override fun clearAllData() {
+        val installation = getResponseString(PreferencesKeyConstants.NEW_INSTALLATION)
         preference.clear()
         securePreferences.clear()
+        if (PreferencesKeyConstants.I_OLD == installation) {
+           saveResponseStringData(PreferencesKeyConstants.NEW_INSTALLATION, PreferencesKeyConstants.I_OLD)
+        }
     }
 
     override fun clearOldSessionAuth() {

build.gradle

@@ -6,8 +6,8 @@ project.ext {
     appTargetSdk = 35
     appCompiledSdk = 35
     appBuildTool = "35.0.0"
-    appVersionCode = 1737
-    appVersionName = "3.90"
+    appVersionCode = 1769
+    appVersionName = "3.91"
     java = "17"
 }
 

fastlane/metadata/android/en-US/changelogs/1769.txt

@@ -0,0 +1,4 @@
+v3.91(Mobile)
+* Fixed invalid captcha payload.
+* Fixed mobile not registering app install.
+* Several minor performance and stability enhancements

fastlane/metadata/android/en-US/changelogs/1770.txt

@@ -0,0 +1,2 @@
+v3.91(TV)
+* Several minor performance and stability enhancements

mobile/build.gradle

@@ -28,8 +28,8 @@ android {
         applicationId rootProject.AppId
         minSdkVersion rootProject.appMinSdk
         targetSdkVersion rootProject.appTargetSdk
-        versionName System.getenv().getOrDefault("VERSION_NAME", "3.90")
-        versionCode 1737
+        versionName System.getenv().getOrDefault("VERSION_NAME", "3.91")
+        versionCode 1769
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "com.windscribe.vpn.CustomRunner"

mobile/src/main/java/com/windscribe/mobile/di/ComposeModule.kt

@@ -181,7 +181,7 @@ class ComposeModule {
                 } else if (modelClass.isAssignableFrom(EditCustomConfigViewmodel::class.java)) {
                     return EditCustomConfigViewmodelImpl(localDbInterface, windVpnController) as T
                 } else if (modelClass.isAssignableFrom(AppStartActivityViewModel::class.java)) {
-                    return AppStartActivityViewModelImpl(appPreferenceHelper) as T
+                    return AppStartActivityViewModelImpl(appPreferenceHelper, apiCallManager) as T
                 } else if (modelClass.isAssignableFrom(MainMenuViewModel::class.java)) {
                     return MainMenuViewModelImpl(userRepository) as T
                 } else if (modelClass.isAssignableFrom(GeneralViewModel::class.java)) {

mobile/src/main/java/com/windscribe/mobile/ui/AppStartActivityViewModel.kt

@@ -2,12 +2,21 @@ package com.windscribe.mobile.ui
 
 import androidx.annotation.DrawableRes
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.windscribe.vpn.api.ApiCallManager
+import com.windscribe.vpn.api.IApiCallManager
 import com.windscribe.vpn.apppreference.PreferencesHelper
 import com.windscribe.vpn.autoconnection.AutoConnectionModeCallback
 import com.windscribe.vpn.autoconnection.ProtocolInformation
+import com.windscribe.vpn.commonutils.Ext.result
+import com.windscribe.vpn.constants.PreferencesKeyConstants
+import com.windscribe.vpn.repository.CallResult
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 import net.grandcentrix.tray.core.OnTrayPreferenceChangeListener
+import org.slf4j.LoggerFactory
+import kotlin.math.log
 
 abstract class DialogCallback {
     abstract fun onDismiss()
@@ -40,19 +49,41 @@ abstract class AppStartActivityViewModel : ViewModel() {
     abstract fun setDialogCallback(data: DialogData, dialogCallback: DialogCallback)
 }
 
-class AppStartActivityViewModelImpl(val preferencesHelper: PreferencesHelper) :
+class AppStartActivityViewModelImpl(val preferencesHelper: PreferencesHelper, val apiCalManager: IApiCallManager) :
     AppStartActivityViewModel() {
     private var _hapticFeedback = MutableStateFlow(preferencesHelper.isHapticFeedbackEnabled)
     override val hapticFeedback: StateFlow<Boolean> = _hapticFeedback
+    private val logger = LoggerFactory.getLogger("ui")
 
     private val trayPreferenceChangeListener = OnTrayPreferenceChangeListener {
         _hapticFeedback.value = preferencesHelper.isHapticFeedbackEnabled
     }
 
     init {
         preferencesHelper.addObserver(trayPreferenceChangeListener)
+        recordInstall()
     }
 
+    private fun recordInstall() {
+       viewModelScope.launch {
+           if (preferencesHelper.isNewApplicationInstance) {
+               preferencesHelper.isNewApplicationInstance = false
+               val installation = preferencesHelper.getResponseString(PreferencesKeyConstants.NEW_INSTALLATION)
+               if (PreferencesKeyConstants.I_NEW == installation) {
+                   preferencesHelper.saveResponseStringData(PreferencesKeyConstants.NEW_INSTALLATION, PreferencesKeyConstants.I_OLD)
+                   val result = apiCalManager.recordAppInstall().result<String?>()
+                   when(result) {
+                       is CallResult.Success -> {
+                           logger.info("App install recorded successfully.")
+                       }
+                       is CallResult.Error -> {
+                           logger.error("Failed to record app install ${result.errorMessage}")
+                       }
+                   }
+               }
+           }
+       }
+    }
     override fun setConnectionCallback(
         protocolInformationList: List<ProtocolInformation>,
         autoConnectionModeCallback: AutoConnectionModeCallback,

mobile/src/main/java/com/windscribe/mobile/ui/common/CaptchaDialog.kt

@@ -211,7 +211,26 @@ fun CaptchaDebugView(
                                         0f,
                                         backgroundSize.value.height - scaledSliderHeight.toFloat()
                                     )
-                                    dragHistory.add(Pair(newX, newY - (initialY.floatValue * scaleFactor)))
+                                    val newPoint = Pair(newX, newY - (initialY.floatValue * scaleFactor))
+                                    
+                                    // Only add point if it's at least 0.5 pixels away from the last recorded point
+                                    val shouldRecord = if (dragHistory.isEmpty()) {
+                                        true
+                                    } else {
+                                        val lastPoint = dragHistory.last()
+                                        val distance = kotlin.math.sqrt(
+                                            (newPoint.first - lastPoint.first) * (newPoint.first - lastPoint.first) +
+                                            (newPoint.second - lastPoint.second) * (newPoint.second - lastPoint.second)
+                                        )
+                                        distance >= 0.5f
+                                    }
+                                    
+                                    if (shouldRecord) {
+                                        dragHistory.add(newPoint)
+                                        if (dragHistory.size > 50) {
+                                            dragHistory.removeAt(0)
+                                        }
+                                    }
                                     sliderPositionX.floatValue = newX
                                     sliderPositionY.floatValue = newY
                                     dragJob?.cancel()

tv/build.gradle

@@ -27,8 +27,8 @@ android {
         applicationId rootProject.AppId
         minSdkVersion rootProject.appMinSdk
         targetSdkVersion rootProject.appTargetSdk
-        versionName System.getenv().getOrDefault("VERSION_NAME", "3.90")
-        versionCode 1738
+        versionName System.getenv().getOrDefault("VERSION_NAME", "3.91")
+        versionCode 1770
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"