TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-29 20:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with dev

Browse Source
This commit is contained in:
Ryan ZHAO 2021-02-01 14:23:26 +11:00
parent 058edbdfba
commit a34a18f5f1
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationBottomSheet.kt
View File

@ -23,6 +23,7 @@ class KeyPairMigrationBottomSheet : BottomSheetDialogFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
upgradeNowButton.setOnClickListener { upgradeNow() } upgradeNowButton.setOnClickListener { upgradeNow() }
upgradeLaterButton.setOnClickListener { upgradeLater() }
} }
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@ -41,4 +42,13 @@ class KeyPairMigrationBottomSheet : BottomSheetDialogFragment() {
val applicationContext = requireContext().applicationContext as ApplicationContext val applicationContext = requireContext().applicationContext as ApplicationContext
applicationContext.clearAllData(true) 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()
}
} }

8
app/src/main/res/layout/fragment_key_pair_migration_bottom_sheet.xml
View File

@ -49,4 +49,12 @@
android:layout_marginTop="@dimen/very_large_spacing" android:layout_marginTop="@dimen/very_large_spacing"
android:text="Upgrade Now" /> android:text="Upgrade Now" />
<Button
style="@style/Widget.Session.Button.Common.UnimportantOutline"
android:id="@+id/upgradeLaterButton"
android:layout_width="240dp"
android:layout_height="@dimen/medium_button_height"
android:layout_marginTop="@dimen/medium_spacing"
android:text="Upgrade Later" />
</LinearLayout> </LinearLayout>