frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

LogViewerActivity: re-add error case to log export

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2020-03-26 15:58:02 -06:00
parent 0726b1b4d9
commit a3a429bc41
8 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
+15 -6
View File
@@ -35,6 +35,7 @@ import com.wireguard.android.BuildConfig
import com.wireguard.android.R
import com.wireguard.android.databinding.LogViewerActivityBinding
import com.wireguard.android.util.DownloadsFileSaver
import com.wireguard.android.util.ErrorMessages
import com.wireguard.android.widget.EdgeToEdge.setUpFAB
import com.wireguard.android.widget.EdgeToEdge.setUpRoot
import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
@@ -169,17 +170,25 @@ class LogViewerActivity : AppCompatActivity() {
withContext(Dispatchers.Main) {
saveButton?.isEnabled = false
withContext(Dispatchers.IO) {
val outputFile = DownloadsFileSaver.save(context, "wireguard-log.txt", "text/plain", true)
outputFile.outputStream.use {
it.write(rawLogLines.toString().toByteArray(Charsets.UTF_8))
var exception: Throwable? = null
var outputFile: DownloadsFileSaver.DownloadsFile? = null
try {
outputFile = DownloadsFileSaver.save(context, "wireguard-log.txt", "text/plain", true)
outputFile.outputStream.use {
it.write(rawLogLines.toString().toByteArray(Charsets.UTF_8))
}
} catch (e: Throwable) {
outputFile?.delete()
exception = e
}
withContext(Dispatchers.Main) {
saveButton?.isEnabled = true
Snackbar.make(findViewById(android.R.id.content),
getString(R.string.log_export_success, outputFile.fileName),
Snackbar.LENGTH_SHORT)
if (exception == null) getString(R.string.log_export_success, outputFile?.fileName)
else getString(R.string.log_export_error, ErrorMessages.get(exception)),
if (exception == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG)
.setAnchorView(binding.shareFab)
.show()
saveButton?.isEnabled = true
}
}
}