diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-16 17:56:07 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-17 14:50:37 +0200 |
commit | a9ec8285062636fc7be68fee123bb5899e639fdd (patch) | |
tree | f11be67e983779e74eb0f5431b2bcda0e5c0d480 /ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt | |
parent | LogViewerActivity: simplify scoping (diff) | |
download | wireguard-android-a9ec8285062636fc7be68fee123bb5899e639fdd.tar.xz wireguard-android-a9ec8285062636fc7be68fee123bb5899e639fdd.zip |
DownloadsFileSaver: encapsulate permission checks
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt')
-rw-r--r-- | ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt | 7 |
1 files changed, 3 insertions, 4 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 456ad6ce..19f67834 100644 --- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt @@ -60,7 +60,6 @@ import java.util.regex.Matcher import java.util.regex.Pattern class LogViewerActivity : AppCompatActivity() { - private lateinit var binding: LogViewerActivityBinding private lateinit var logAdapter: LogEntryAdapter private var logLines = arrayListOf<LogLine>() @@ -161,15 +160,15 @@ class LogViewerActivity : AppCompatActivity() { withContext(Dispatchers.IO) { try { outputFile = DownloadsFileSaver.save(this@LogViewerActivity, "wireguard-log.txt", "text/plain", true) - outputFile?.outputStream.use { - it?.write(rawLogLines.toString().toByteArray(Charsets.UTF_8)) - } + outputFile?.outputStream?.write(rawLogLines.toString().toByteArray(Charsets.UTF_8)) } catch (e: Throwable) { outputFile?.delete() exception = e } } saveButton?.isEnabled = true + if (outputFile == null) + return Snackbar.make(findViewById(android.R.id.content), if (exception == null) getString(R.string.log_export_success, outputFile?.fileName) else getString(R.string.log_export_error, ErrorMessages[exception]), |