Skip to content

Commit c046706

Browse files
zx2c4zx2c4
committed
ui: reformat all code
Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent a3bfa6f commit c046706

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+343
-234
lines changed

‎.idea/codeStyles/Project.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tunnel/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@file:Suppress("UnstableApiUsage")
2+
23
import org.gradle.api.tasks.testing.logging.TestLogEvent
34

45
val pkg: String = providers.gradleProperty("wireguardPackageName").get()

‎ui/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@file:Suppress("UnstableApiUsage")
2+
23
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
45

‎ui/src/googleplay/AndroidManifest.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
4-
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
4+
5+
<uses-permission
6+
android:name="android.permission.REQUEST_INSTALL_PACKAGES"
7+
tools:node="remove" />
58
<application>
6-
<receiver android:name=".updater.Updater$AppUpdatedReceiver" tools:node="remove" />
9+
<receiver
10+
android:name=".updater.Updater$AppUpdatedReceiver"
11+
tools:node="remove" />
712
</application>
813
</manifest>

‎ui/src/main/AndroidManifest.xml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@
4545

4646
<activity
4747
android:name=".activity.TunnelToggleActivity"
48-
android:theme="@style/NoBackgroundTheme"
49-
android:excludeFromRecents="true"/>
48+
android:excludeFromRecents="true"
49+
android:theme="@style/NoBackgroundTheme" />
5050

51-
<activity android:name=".activity.MainActivity" android:exported="true">
51+
<activity
52+
android:name=".activity.MainActivity"
53+
android:exported="true">
5254
<intent-filter>
5355
<action android:name="android.intent.action.MAIN" />
5456

@@ -62,8 +64,8 @@
6264

6365
<activity
6466
android:name=".activity.TvMainActivity"
65-
android:theme="@style/TvTheme"
66-
android:exported="true">
67+
android:exported="true"
68+
android:theme="@style/TvTheme">
6769
<intent-filter>
6870
<action android:name="android.intent.action.MAIN" />
6971
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
@@ -87,8 +89,8 @@
8789

8890
<activity
8991
android:name=".activity.LogViewerActivity"
90-
android:label="@string/log_viewer_title"
91-
android:exported="false">
92+
android:exported="false"
93+
android:label="@string/log_viewer_title">
9294
<intent-filter>
9395
<action android:name="android.intent.action.MAIN" />
9496
</intent-filter>
@@ -100,23 +102,27 @@
100102
android:exported="false"
101103
android:grantUriPermissions="true" />
102104

103-
<receiver android:name=".BootShutdownReceiver" android:exported="true">
105+
<receiver
106+
android:name=".BootShutdownReceiver"
107+
android:exported="true">
104108
<intent-filter>
105109
<action android:name="android.intent.action.ACTION_SHUTDOWN" />
106110
<action android:name="android.intent.action.BOOT_COMPLETED" />
107111
</intent-filter>
108112
</receiver>
109113

110-
<receiver android:name=".updater.Updater$AppUpdatedReceiver" android:exported="true">
114+
<receiver
115+
android:name=".updater.Updater$AppUpdatedReceiver"
116+
android:exported="true">
111117
<intent-filter>
112118
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
113119
</intent-filter>
114120
</receiver>
115121

116122
<receiver
117123
android:name=".model.TunnelManager$IntentReceiver"
118-
android:permission="${applicationId}.permission.CONTROL_TUNNELS"
119-
android:exported="true">
124+
android:exported="true"
125+
android:permission="${applicationId}.permission.CONTROL_TUNNELS">
120126
<intent-filter>
121127
<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
122128
<action android:name="com.wireguard.android.action.SET_TUNNEL_UP" />
@@ -126,9 +132,9 @@
126132

127133
<service
128134
android:name=".QuickTileService"
135+
android:exported="true"
129136
android:icon="@drawable/ic_tile"
130-
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
131-
android:exported="true">
137+
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
132138

133139
<intent-filter>
134140
<action android:name="android.service.quicksettings.action.QS_TILE" />

‎ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ abstract class BaseActivity : AppCompatActivity() {
6767
protected abstract fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?): Boolean
6868

6969
fun removeOnSelectedTunnelChangedListener(
70-
listener: OnSelectedTunnelChangedListener) {
70+
listener: OnSelectedTunnelChangedListener
71+
) {
7172
selectionChangeRegistry.remove(listener)
7273
}
7374

@@ -77,17 +78,17 @@ abstract class BaseActivity : AppCompatActivity() {
7778

7879
private class SelectionChangeNotifier : NotifierCallback<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>() {
7980
override fun onNotifyCallback(
80-
listener: OnSelectedTunnelChangedListener,
81-
oldTunnel: ObservableTunnel?,
82-
ignored: Int,
83-
newTunnel: ObservableTunnel?
81+
listener: OnSelectedTunnelChangedListener,
82+
oldTunnel: ObservableTunnel?,
83+
ignored: Int,
84+
newTunnel: ObservableTunnel?
8485
) {
8586
listener.onSelectedTunnelChanged(oldTunnel, newTunnel)
8687
}
8788
}
8889

8990
private class SelectionChangeRegistry :
90-
CallbackRegistry<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>(SelectionChangeNotifier())
91+
CallbackRegistry<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>(SelectionChangeNotifier())
9192

9293
companion object {
9394
private const val KEY_SELECTED_TUNNEL = "selected_tunnel"

‎ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,20 @@ class LogViewerActivity : AppCompatActivity() {
142142
finish()
143143
true
144144
}
145+
145146
R.id.save_log -> {
146147
saveButton?.isEnabled = false
147148
lifecycleScope.launch { saveLog() }
148149
true
149150
}
151+
150152
else -> super.onOptionsItemSelected(item)
151153
}
152154
}
153155

154156
private val downloadsFileSaver = DownloadsFileSaver(this)
155157

156-
private suspend fun rawLogBytes() : ByteArray {
158+
private suspend fun rawLogBytes(): ByteArray {
157159
val builder = StringBuilder()
158160
withContext(Dispatchers.IO) {
159161
for (i in 0 until rawLogLines.size()) {
@@ -179,12 +181,14 @@ class LogViewerActivity : AppCompatActivity() {
179181
saveButton?.isEnabled = true
180182
if (outputFile == null)
181183
return
182-
Snackbar.make(findViewById(android.R.id.content),
183-
if (exception == null) getString(R.string.log_export_success, outputFile?.fileName)
184-
else getString(R.string.log_export_error, ErrorMessages[exception]),
185-
if (exception == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG)
186-
.setAnchorView(binding.shareFab)
187-
.show()
184+
Snackbar.make(
185+
findViewById(android.R.id.content),
186+
if (exception == null) getString(R.string.log_export_success, outputFile?.fileName)
187+
else getString(R.string.log_export_error, ErrorMessages[exception]),
188+
if (exception == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
189+
)
190+
.setAnchorView(binding.shareFab)
191+
.show()
188192
}
189193

190194
private suspend fun streamingLog() = withContext(Dispatchers.IO) {
@@ -287,7 +291,8 @@ class LogViewerActivity : AppCompatActivity() {
287291
*
288292
* <pre>05-26 11:02:36.886 5689 5689 D AndroidRuntime: CheckJNI is OFF.</pre>
289293
*/
290-
private val THREADTIME_LINE: Pattern = Pattern.compile("^(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3})(?:\\s+[0-9A-Za-z]+)?\\s+(\\d+)\\s+(\\d+)\\s+([A-Z])\\s+(.+?)\\s*: (.*)$")
294+
private val THREADTIME_LINE: Pattern =
295+
Pattern.compile("^(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3})(?:\\s+[0-9A-Za-z]+)?\\s+(\\d+)\\s+(\\d+)\\s+([A-Z])\\s+(.+?)\\s*: (.*)$")
291296
private val LOGS: MutableMap<String, ByteArray> = ConcurrentHashMap()
292297
private const val TAG = "WireGuard/LogViewerActivity"
293298
}
@@ -310,7 +315,7 @@ class LogViewerActivity : AppCompatActivity() {
310315

311316
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
312317
val view = LayoutInflater.from(parent.context)
313-
.inflate(R.layout.log_viewer_entry, parent, false)
318+
.inflate(R.layout.log_viewer_entry, parent, false)
314319
return ViewHolder(view)
315320
}
316321

@@ -321,8 +326,10 @@ class LogViewerActivity : AppCompatActivity() {
321326
else
322327
SpannableString("${line.tag}: ${line.msg}").apply {
323328
setSpan(StyleSpan(BOLD), 0, "${line.tag}:".length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
324-
setSpan(ForegroundColorSpan(levelToColor(line.level)),
325-
0, "${line.tag}:".length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
329+
setSpan(
330+
ForegroundColorSpan(levelToColor(line.level)),
331+
0, "${line.tag}:".length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
332+
)
326333
}
327334
holder.layout.apply {
328335
findViewById<MaterialTextView>(R.id.log_date).text = line.time.toString()
@@ -344,11 +351,11 @@ class LogViewerActivity : AppCompatActivity() {
344351
override fun insert(uri: Uri, values: ContentValues?): Uri? = null
345352

346353
override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, sortOrder: String?): Cursor? =
347-
logForUri(uri)?.let {
348-
val m = MatrixCursor(arrayOf(android.provider.OpenableColumns.DISPLAY_NAME, android.provider.OpenableColumns.SIZE), 1)
349-
m.addRow(arrayOf("wireguard-log.txt", it.size.toLong()))
350-
m
351-
}
354+
logForUri(uri)?.let {
355+
val m = MatrixCursor(arrayOf(android.provider.OpenableColumns.DISPLAY_NAME, android.provider.OpenableColumns.SIZE), 1)
356+
m.addRow(arrayOf("wireguard-log.txt", it.size.toLong()))
357+
m
358+
}
352359

353360
override fun onCreate(): Boolean = true
354361

@@ -358,7 +365,8 @@ class LogViewerActivity : AppCompatActivity() {
358365

359366
override fun getType(uri: Uri): String? = logForUri(uri)?.let { "text/plain" }
360367

361-
override fun getStreamTypes(uri: Uri, mimeTypeFilter: String): Array<String>? = getType(uri)?.let { if (compareMimeTypes(it, mimeTypeFilter)) arrayOf(it) else null }
368+
override fun getStreamTypes(uri: Uri, mimeTypeFilter: String): Array<String>? =
369+
getType(uri)?.let { if (compareMimeTypes(it, mimeTypeFilter)) arrayOf(it) else null }
362370

363371
override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? {
364372
if (mode != "r") return null

‎ui/src/main/java/com/wireguard/android/activity/MainActivity.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
7777
onBackPressedDispatcher.onBackPressed()
7878
true
7979
}
80+
8081
R.id.menu_action_edit -> {
8182
supportFragmentManager.commit {
8283
replace(R.id.detail_container, TunnelEditorFragment())
@@ -91,12 +92,15 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
9192
startActivity(Intent(this, SettingsActivity::class.java))
9293
true
9394
}
95+
9496
else -> super.onOptionsItemSelected(item)
9597
}
9698
}
9799

98-
override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?,
99-
newTunnel: ObservableTunnel?): Boolean {
100+
override fun onSelectedTunnelChanged(
101+
oldTunnel: ObservableTunnel?,
102+
newTunnel: ObservableTunnel?
103+
): Boolean {
100104
val fragmentManager = supportFragmentManager
101105
if (fragmentManager.isStateSaved) {
102106
return false

‎ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ class SettingsActivity : AppCompatActivity() {
6262
zipExporter?.parent?.removePreference(zipExporter)
6363
}
6464
val wgQuickOnlyPrefs = arrayOf(
65-
preferenceManager.findPreference("tools_installer"),
66-
preferenceManager.findPreference("restore_on_boot"),
67-
preferenceManager.findPreference<Preference>("multiple_tunnels")
65+
preferenceManager.findPreference("tools_installer"),
66+
preferenceManager.findPreference("restore_on_boot"),
67+
preferenceManager.findPreference<Preference>("multiple_tunnels")
6868
).filterNotNull()
6969
wgQuickOnlyPrefs.forEach { it.isVisible = false }
7070
lifecycleScope.launch {

‎ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import kotlinx.coroutines.launch
2424

2525
@RequiresApi(Build.VERSION_CODES.N)
2626
class TunnelToggleActivity : AppCompatActivity() {
27-
private val permissionActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { toggleTunnelWithPermissionsResult() }
27+
private val permissionActivityResultLauncher =
28+
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { toggleTunnelWithPermissionsResult() }
2829

2930
private fun toggleTunnelWithPermissionsResult() {
3031
val tunnel = Application.getTunnelManager().lastUsedTunnel ?: return

‎ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,13 @@ class TvMainActivity : AppCompatActivity() {
211211
try {
212212
tunnelFileImportResultLauncher.launch("*/*")
213213
} catch (_: Throwable) {
214-
MaterialAlertDialogBuilder(binding.root.context).setMessage(R.string.tv_no_file_picker).setCancelable(false).setPositiveButton(android.R.string.ok) { _, _ ->
215-
try {
216-
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect")))
217-
} catch (_: Throwable) {
218-
}
219-
}.show()
214+
MaterialAlertDialogBuilder(binding.root.context).setMessage(R.string.tv_no_file_picker).setCancelable(false)
215+
.setPositiveButton(android.R.string.ok) { _, _ ->
216+
try {
217+
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect")))
218+
} catch (_: Throwable) {
219+
}
220+
}.show()
220221
}
221222
}
222223
}
@@ -359,6 +360,7 @@ class TvMainActivity : AppCompatActivity() {
359360
binding.tunnelList.requestFocus()
360361
}
361362
}
363+
362364
filesRoot.get()?.isNotEmpty() == true -> {
363365
files.clear()
364366
filesRoot.set("")
@@ -372,7 +374,7 @@ class TvMainActivity : AppCompatActivity() {
372374
private suspend fun updateStats() {
373375
binding.tunnelList.forEach { viewItem ->
374376
val listItem = DataBindingUtil.findBinding<TvTunnelListItemBinding>(viewItem)
375-
?: return@forEach
377+
?: return@forEach
376378
try {
377379
val tunnel = listItem.item!!
378380
if (tunnel.state != Tunnel.State.UP || isDeleting.get()) {

‎ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class FileConfigStore(private val context: Context) : ConfigStore {
4040

4141
override fun enumerate(): Set<String> {
4242
return context.fileList()
43-
.filter { it.endsWith(".conf") }
44-
.map { it.substring(0, it.length - ".conf".length) }
45-
.toSet()
43+
.filter { it.endsWith(".conf") }
44+
.map { it.substring(0, it.length - ".conf".length) }
45+
.toSet()
4646
}
4747

4848
private fun fileFor(name: String): File {

0 commit comments

Comments
 (0)