Cleanup

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt

@@ -31,7 +31,7 @@ import net.mullvad.mullvadvpn.service.migration.MigrateSplitTunneling
 import net.mullvad.mullvadvpn.service.notifications.ForegroundNotificationManager
 import net.mullvad.mullvadvpn.service.notifications.NotificationChannelFactory
 import net.mullvad.mullvadvpn.service.notifications.NotificationManager
-import net.mullvad.mullvadvpn.service.util.AssetToFilesDirExtractor
+import net.mullvad.mullvadvpn.service.util.extractAndOverwriteIfAssetMoreRecent
 import net.mullvad.talpid.TalpidVpnService
 import org.koin.android.ext.android.getKoin
 import org.koin.core.context.loadKoinModules
@@ -231,10 +231,8 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     private fun Context.prepareFiles() {
-        AssetToFilesDirExtractor(this).apply {
-            extract(RELAY_LIST_ASSET_NAME, overwriteFileIfAssetMoreRecent = true)
-            extract(MAYBENOT_MACHINES_ASSET_NAME, overwriteFileIfAssetMoreRecent = true)
-        }
+        extractAndOverwriteIfAssetMoreRecent(RELAY_LIST_ASSET_NAME)
+        extractAndOverwriteIfAssetMoreRecent(MAYBENOT_MACHINES_ASSET_NAME)
     }
 
     companion object {

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/util/ContextExtensions.kt

@@ -0,0 +1,23 @@
+package net.mullvad.mullvadvpn.service.util
+
+import android.content.Context
+import java.io.File
+import java.io.FileOutputStream
+
+fun Context.extractAndOverwriteIfAssetMoreRecent(assetName: String) {
+    val forceOverwriteIfMoreRecent = lastUpdatedTime() > File(filesDir, assetName).lastModified()
+    val destination = File(filesDir, assetName)
+
+    if (!destination.exists() || forceOverwriteIfMoreRecent) {
+        extractFile(assetName, destination)
+    }
+}
+
+private fun Context.lastUpdatedTime(): Long =
+    packageManager.getPackageInfo(packageName, 0).lastUpdateTime
+
+private fun Context.extractFile(asset: String, destination: File) {
+    val destinationStream = FileOutputStream(destination)
+    assets.open(asset).copyTo(destinationStream)
+    destinationStream.close()
+}