Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: use modal corruption alert instead of snackbar

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2023-05-11 13:50:26 +02:00
parent 254e6164d7
commit 6a72194106
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/src/main/java/com/wireguard/android/updater/SnackbarUpdateShower.kt
View File

@ -12,6 +12,7 @@ import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.BaseTransientBottomBar
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.wireguard.android.R import com.wireguard.android.R
@ -34,7 +35,6 @@ class SnackbarUpdateShower(private val fragment: Fragment) {
private val statusSnackbar = makeSnackbar(fragment, view, anchor) private val statusSnackbar = makeSnackbar(fragment, view, anchor)
private var showingAction: Boolean = false private var showingAction: Boolean = false
private var showingStatus: Boolean = false private var showingStatus: Boolean = false
private var permanentAction: Boolean = false
private fun makeSnackbar(fragment: Fragment, view: View, anchor: View?): Snackbar { private fun makeSnackbar(fragment: Fragment, view: View, anchor: View?): Snackbar {
val snackbar = Snackbar.make(fragment.requireContext(), view, "", Snackbar.LENGTH_INDEFINITE) val snackbar = Snackbar.make(fragment.requireContext(), view, "", Snackbar.LENGTH_INDEFINITE)
@ -49,7 +49,7 @@ class SnackbarUpdateShower(private val fragment: Fragment) {
snackbar.addCallback(object : BaseTransientBottomBar.BaseCallback<Snackbar>() { snackbar.addCallback(object : BaseTransientBottomBar.BaseCallback<Snackbar>() {
override fun onDismissed(snackbar: Snackbar?, @DismissEvent event: Int) { override fun onDismissed(snackbar: Snackbar?, @DismissEvent event: Int) {
super.onDismissed(snackbar, event) super.onDismissed(snackbar, event)
if (event == DISMISS_EVENT_MANUAL || (event == DISMISS_EVENT_ACTION && !permanentAction) || if (event == DISMISS_EVENT_MANUAL || event == DISMISS_EVENT_ACTION ||
(snackbar == actionSnackbar && !showingAction) || (snackbar == statusSnackbar && !showingStatus) (snackbar == actionSnackbar && !showingAction) || (snackbar == statusSnackbar && !showingStatus)
) )
return return
@ -62,12 +62,11 @@ class SnackbarUpdateShower(private val fragment: Fragment) {
return snackbar return snackbar
} }
fun showAction(text: String, action: String, permanent: Boolean = false, listener: View.OnClickListener) { fun showAction(text: String, action: String, listener: View.OnClickListener) {
if (showingStatus) { if (showingStatus) {
showingStatus = false showingStatus = false
statusSnackbar.dismiss() statusSnackbar.dismiss()
} }
permanentAction = permanent
actionSnackbar.setText(text) actionSnackbar.setText(text)
actionSnackbar.setAction(action, listener) actionSnackbar.setAction(action, listener)
if (!showingAction) { if (!showingAction) {
@ -148,7 +147,10 @@ class SnackbarUpdateShower(private val fragment: Fragment) {
} }
is Updater.Progress.Corrupt -> { is Updater.Progress.Corrupt -> {
snackbar.showAction(context.getString(R.string.updater_corrupt), context.getString(R.string.updater_corrupt_navigate), true) { MaterialAlertDialogBuilder(context)
.setTitle(R.string.updater_corrupt_title)
.setMessage(R.string.updater_corrupt_message)
.setPositiveButton(R.string.updater_corrupt_navigate) { _, _ ->
val intent = Intent(Intent.ACTION_VIEW) val intent = Intent(Intent.ACTION_VIEW)
intent.data = Uri.parse(progress.downloadUrl) intent.data = Uri.parse(progress.downloadUrl)
try { try {
@ -156,7 +158,14 @@ class SnackbarUpdateShower(private val fragment: Fragment) {
} catch (e: Throwable) { } catch (e: Throwable) {
Toast.makeText(context, ErrorMessages[e], Toast.LENGTH_SHORT).show() Toast.makeText(context, ErrorMessages[e], Toast.LENGTH_SHORT).show()
} }
} }.setCancelable(false).setOnDismissListener {
val intent = Intent(Intent.ACTION_MAIN)
intent.addCategory(Intent.CATEGORY_HOME)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
System.exit(0)
}.show()
} }
} }
}.launchIn(fragment.lifecycleScope) }.launchIn(fragment.lifecycleScope)

3
ui/src/main/res/values/strings.xml
View File

@ -240,7 +240,8 @@
<string name="updater_download_progress_nototal">Downloading update: %s</string> <string name="updater_download_progress_nototal">Downloading update: %s</string>
<string name="updater_installing">Installing update…</string> <string name="updater_installing">Installing update…</string>
<string name="updater_failure">Update failure: %s. Will retry momentarily…</string> <string name="updater_failure">Update failure: %s. Will retry momentarily…</string>
<string name="updater_corrupt">This application is corrupt. Please re-download it.</string> <string name="updater_corrupt_title">Application Corrupt</string>
<string name="updater_corrupt_message">This application is corrupt. Please re-download the APK from the website linked below. After, uninstall this application, and reinstall it from downloaded APK.</string>
<string name="updater_corrupt_navigate">Open Website</string> <string name="updater_corrupt_navigate">Open Website</string>
<string name="version_summary">%1$s backend %2$s</string> <string name="version_summary">%1$s backend %2$s</string>
<string name="version_summary_checking">Checking %s backend version</string> <string name="version_summary_checking">Checking %s backend version</string>