Skip to content

Commit 05511d4

Browse files
committed
ui: cleanup code after churn
Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 15da17b commit 05511d4

File tree

5 files changed

+206
-220
lines changed

5 files changed

+206
-220
lines changed

ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ package com.wireguard.android.fragment
66

77
import android.content.Intent
88
import android.content.res.Resources
9-
import android.net.Uri
109
import android.os.Bundle
11-
import android.provider.OpenableColumns
1210
import android.util.Log
1311
import android.view.LayoutInflater
1412
import android.view.Menu
@@ -29,28 +27,16 @@ import com.wireguard.android.activity.TunnelCreatorActivity
2927
import com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler
3028
import com.wireguard.android.databinding.TunnelListFragmentBinding
3129
import com.wireguard.android.databinding.TunnelListItemBinding
32-
import com.wireguard.android.fragment.ConfigNamingDialogFragment.Companion.newInstance
3330
import com.wireguard.android.model.ObservableTunnel
3431
import com.wireguard.android.util.ErrorMessages
3532
import com.wireguard.android.util.TunnelImporter
3633
import com.wireguard.android.widget.MultiselectableRelativeLayout
37-
import com.wireguard.config.Config
38-
import kotlinx.coroutines.Deferred
39-
import kotlinx.coroutines.Dispatchers
4034
import kotlinx.coroutines.SupervisorJob
4135
import kotlinx.coroutines.async
4236
import kotlinx.coroutines.awaitAll
4337
import kotlinx.coroutines.launch
44-
import kotlinx.coroutines.withContext
45-
import java.io.BufferedReader
46-
import java.io.ByteArrayInputStream
47-
import java.io.InputStreamReader
48-
import java.nio.charset.StandardCharsets
4938
import java.util.ArrayList
5039
import java.util.HashSet
51-
import java.util.Locale
52-
import java.util.zip.ZipEntry
53-
import java.util.zip.ZipInputStream
5440

5541
/**
5642
* Fragment containing a list of known WireGuard tunnels. It allows creating and deleting tunnels.
@@ -67,7 +53,8 @@ class TunnelListFragment : BaseFragment() {
6753
}
6854

6955
private val qrImportResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
70-
val qrCode = IntentIntegrator.parseActivityResult(result.resultCode, result.data)?.contents ?: return@registerForActivityResult
56+
val qrCode = IntentIntegrator.parseActivityResult(result.resultCode, result.data)?.contents
57+
?: return@registerForActivityResult
7158
lifecycleScope.launch { TunnelImporter.importTunnel(parentFragmentManager, qrCode) { showSnackbar(it) } }
7259
}
7360

ui/src/main/java/com/wireguard/android/util/Extensions.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import androidx.annotation.AttrRes
1111
import androidx.lifecycle.lifecycleScope
1212
import androidx.preference.Preference
1313
import com.wireguard.android.Application
14-
import com.wireguard.android.R
1514
import com.wireguard.android.activity.SettingsActivity
1615
import kotlinx.coroutines.CoroutineScope
1716

ui/src/main/res/drawable/ic_arrow_back.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:height="24dp"
99
android:viewportWidth="24"
1010
android:viewportHeight="24">
11-
<path
12-
android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"
13-
android:fillColor="#000000"/>
11+
<path
12+
android:fillColor="#000000"
13+
android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z" />
1414
</vector>

0 commit comments

Comments
 (0)