aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui/src/main/java
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2021-05-06 16:22:58 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2021-05-06 16:22:58 +0200
commit6008efcd95ec10870c325adce3fff0a85ecda238 (patch)
tree55db78e63493899cd47646e86d69242dd9f82e37 /ui/src/main/java
parenttunnel: avoid race between shutdown and stats (diff)
downloadwireguard-android-6008efcd95ec10870c325adce3fff0a85ecda238.tar.xz
wireguard-android-6008efcd95ec10870c325adce3fff0a85ecda238.zip
ui: remove hack for broken kotlin compiler
Seems like things are finally fixed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/src/main/java')
-rw-r--r--ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt6
1 files changed, 1 insertions, 5 deletions
diff --git a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
index f928161e..e13184f9 100644
--- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
@@ -202,11 +202,7 @@ class LogViewerActivity : AppCompatActivity() {
it.scrollToPosition(logLines.size - 1)
}
} else {
- /* TODO: I'd prefer for the next line to be:
- * logLines.lastOrNull()?.msg += "\n$line"
- * However, as of writing, that causes the kotlin compiler to freak out and crash, spewing bytecode.
- */
- logLines.lastOrNull()?.apply { msg += "\n$line" }
+ logLines.lastOrNull()?.msg += "\n$line"
if (haveScrolled) logAdapter.notifyDataSetChanged()
}
if (!haveScrolled) {