diff options
| author | Emīls <emils@mullvad.net> | 2020-05-07 14:44:21 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-05-07 14:44:21 +0100 |
| commit | e64783879dc90e85f597daad2489816723368f1b (patch) | |
| tree | 2eb63b5681d345a810cd95355daeb1ca4b70ff79 /android/src | |
| parent | c9dfec0bcd9d1ba9663e6bf08407440598e896c6 (diff) | |
| parent | ffbcca45ff0b9f8a826403fe90020bc62de69a2d (diff) | |
| download | mullvadvpn-e64783879dc90e85f597daad2489816723368f1b.tar.xz mullvadvpn-e64783879dc90e85f597daad2489816723368f1b.zip | |
Merge branch 'embed-certs'
Diffstat (limited to 'android/src')
3 files changed, 4 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt index 4c291bbc10..66a55503d6 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt @@ -9,7 +9,7 @@ import kotlinx.coroutines.async const val PROBLEM_REPORT_FILE = "problem_report.txt" -class MullvadProblemReport(val logDirectory: File, val resourceDirectory: File) { +class MullvadProblemReport(val logDirectory: File) { private val problemReportPath = File(logDirectory, PROBLEM_REPORT_FILE) private var collectJob: Deferred<Boolean>? = null @@ -56,8 +56,7 @@ class MullvadProblemReport(val logDirectory: File, val resourceDirectory: File) sendProblemReport( userEmail, userMessage, - problemReportPath.absolutePath, - resourceDirectory.absolutePath + problemReportPath.absolutePath ) if (result) { @@ -82,7 +81,6 @@ class MullvadProblemReport(val logDirectory: File, val resourceDirectory: File) private external fun sendProblemReport( userEmail: String, userMessage: String, - reportPath: String, - resourceDir: String + reportPath: String ): Boolean } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 7e5318c892..cf66311494 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -15,7 +15,6 @@ import net.mullvad.mullvadvpn.ui.MainActivity import net.mullvad.talpid.TalpidVpnService import net.mullvad.talpid.util.EventNotifier -private const val API_ROOT_CA_FILE = "api_root_ca.pem" private const val RELAYS_FILE = "relays.json" class MullvadVpnService : TalpidVpnService() { @@ -167,7 +166,6 @@ class MullvadVpnService : TalpidVpnService() { private fun prepareFiles() { FileMigrator(File("/data/data/net.mullvad.mullvadvpn"), filesDir).apply { - migrate(API_ROOT_CA_FILE) migrate(RELAYS_FILE) migrate("settings.json") migrate("daemon.log") @@ -180,7 +178,6 @@ class MullvadVpnService : TalpidVpnService() { lastUpdatedTime() > File(filesDir, RELAYS_FILE).lastModified() FileResourceExtractor(this).apply { - extract(API_ROOT_CA_FILE) extract(RELAYS_FILE, shouldOverwriteRelayList) } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index 60356f4b20..524d4ab00d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -66,7 +66,7 @@ class MainActivity : FragmentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - problemReport = MullvadProblemReport(filesDir, filesDir) + problemReport = MullvadProblemReport(filesDir) setContentView(R.layout.main) |