Merge branch 'remove-config-migration-droid-16'

4 files changed, 2 insertions, 86 deletions

diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml
index c0c2084b9d..2887f5fccb 100644
--- a/android/app/lint-baseline.xml
+++ b/android/app/lint-baseline.xml
@@ -178,17 +178,6 @@
     </issue>
 
     <issue
-        id="SdCardPath"
-        message="Do not hardcode &quot;`/data/`&quot;; use `Context.getFilesDir().getPath()` instead"
-        errorLine1="        FileMigrator(File(&quot;/data/data/net.mullvad.mullvadvpn&quot;), vpnService.filesDir).apply {"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt"
-            line="77"
-            column="28"/>
-    </issue>
-
-    <issue
         id="RedundantLabel"
         message="Redundant label can be removed"
         errorLine1="            android:label=&quot;@string/app_name&quot;"
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
index 67ec721a52..7175765e9f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.service
 
-import java.io.File
 import kotlin.properties.Delegates.observable
 import kotlin.reflect.KClass
 import kotlin.reflect.safeCast
@@ -14,10 +13,8 @@ import kotlinx.coroutines.channels.trySendBlocking
 import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointConfiguration
 import net.mullvad.mullvadvpn.util.Intermittent
 
-private const val RELAYS_FILE = "relays.json"
-
 class DaemonInstance(
-    val vpnService: MullvadVpnService
+    private val vpnService: MullvadVpnService
 ) {
     sealed class Command {
         data class Start(val apiEndpointConfiguration: ApiEndpointConfiguration) : Command()
@@ -45,11 +42,9 @@ class DaemonInstance(
         intermittentDaemon.onDestroy()
     }
 
-    private fun spawnActor() = GlobalScope.actor<Command>(Dispatchers.Default, Channel.UNLIMITED) {
+    private fun spawnActor() = GlobalScope.actor(Dispatchers.Default, Channel.UNLIMITED) {
         var isRunning = true
 
-        prepareFiles()
-
         while (isRunning) {
             val startCommand = waitForCommand(channel, Command.Start::class) ?: break
             startDaemon(startCommand.apiEndpointConfiguration)
@@ -73,24 +68,6 @@ class DaemonInstance(
         }
     }
 
-    private fun prepareFiles() {
-        FileMigrator(File("/data/data/net.mullvad.mullvadvpn"), vpnService.filesDir).apply {
-            migrate(RELAYS_FILE)
-            migrate("settings.json")
-            migrate("daemon.log")
-            migrate("daemon.old.log")
-            migrate("wireguard.log")
-            migrate("wireguard.old.log")
-        }
-
-        val shouldOverwriteRelayList =
-            lastUpdatedTime() > File(vpnService.filesDir, RELAYS_FILE).lastModified()
-
-        FileResourceExtractor(vpnService).apply {
-            extract(RELAYS_FILE, shouldOverwriteRelayList)
-        }
-    }
-
     private suspend fun startDaemon(
         apiEndpointConfiguration: ApiEndpointConfiguration
     ) {
@@ -108,10 +85,4 @@ class DaemonInstance(
     private fun stopDaemon() {
         daemon?.shutdown()
     }
-
-    private fun lastUpdatedTime(): Long {
-        return vpnService.run {
-            packageManager.getPackageInfo(packageName, 0).lastUpdateTime
-        }
-    }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt
deleted file mode 100644
index cd325d8a6f..0000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.mullvad.mullvadvpn.service
-
-import android.util.Log
-import java.io.File
-
-class FileMigrator(val oldDirectory: File, val newDirectory: File) {
-    fun migrate(fileName: String) {
-        try {
-            val oldPath = File(oldDirectory, fileName)
-
-            if (oldPath.exists()) {
-                oldPath.renameTo(File(newDirectory, fileName))
-            }
-        } catch (exception: Exception) {
-            Log.w("mullvad", "Failed to migrate $fileName from $oldDirectory to $newDirectory")
-        }
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
deleted file mode 100644
index 34ca0eaa89..0000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.mullvad.mullvadvpn.service
-
-import android.content.Context
-import java.io.File
-import java.io.FileOutputStream
-
-class FileResourceExtractor(val context: Context) {
-    fun extract(asset: String, force: Boolean = false) {
-        val destination = File(context.filesDir, asset)
-
-        if (!destination.exists() || force) {
-            extractFile(asset, destination)
-        }
-    }
-
-    private fun extractFile(asset: String, destination: File) {
-        val destinationStream = FileOutputStream(destination)
-
-        context
-            .assets
-            .open(asset)
-            .copyTo(destinationStream)
-
-        destinationStream.close()
-    }
-}