From a34a18f5f15e3f479f5c4086c7cfd71a0684a1cc Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Mon, 1 Feb 2021 14:23:26 +1100 Subject: [PATCH] sync with dev --- .../loki/dialogs/KeyPairMigrationBottomSheet.kt | 10 ++++++++++ .../fragment_key_pair_migration_bottom_sheet.xml | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationBottomSheet.kt index f50c69d493..dff4e5fa30 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationBottomSheet.kt @@ -23,6 +23,7 @@ class KeyPairMigrationBottomSheet : BottomSheetDialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) upgradeNowButton.setOnClickListener { upgradeNow() } + upgradeLaterButton.setOnClickListener { upgradeLater() } } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { @@ -41,4 +42,13 @@ class KeyPairMigrationBottomSheet : BottomSheetDialogFragment() { val applicationContext = requireContext().applicationContext as ApplicationContext applicationContext.clearAllData(true) } + + private fun upgradeLater() { + val dialog = AlertDialog.Builder(requireContext()) + dialog.setMessage("You won't be able to send or receive messages until you upgrade.") + dialog.setPositiveButton(R.string.ok) { _, _ -> + dismiss() + } + dialog.create().show() + } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_key_pair_migration_bottom_sheet.xml b/app/src/main/res/layout/fragment_key_pair_migration_bottom_sheet.xml index 5588c2e933..4014fed0a0 100644 --- a/app/src/main/res/layout/fragment_key_pair_migration_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_key_pair_migration_bottom_sheet.xml @@ -49,4 +49,12 @@ android:layout_marginTop="@dimen/very_large_spacing" android:text="Upgrade Now" /> +