From 974be270928a5b7ed9d316c735bb40d905eb48f7 Mon Sep 17 00:00:00 2001 From: Derek Yeh Date: Fri, 14 Aug 2020 09:53:10 -0700 Subject: [PATCH] ssh: sshkeys instant view refresh (fixes #1303) (#1325) --- .../Fragments/DialogFragments/DeleteSSHKey.kt | 15 ++++++++++++--- .../Fragments/DialogFragments/SSHAllKeys.kt | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/DeleteSSHKey.kt b/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/DeleteSSHKey.kt index a0345b8a2..3411791da 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/DeleteSSHKey.kt +++ b/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/DeleteSSHKey.kt @@ -1,8 +1,7 @@ package io.treehouses.remote.Fragments.DialogFragments +import android.content.DialogInterface import android.os.Bundle -import android.text.Editable -import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -18,6 +17,7 @@ class DeleteSSHKey : FullScreenDialogFragment() { } private lateinit var bind : DialogDeleteSshKeyBinding private lateinit var keyToDelete : String + private lateinit var dismissListener : DialogInterface.OnDismissListener override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { bind = DialogDeleteSshKeyBinding.inflate(inflater, container, false) @@ -40,7 +40,7 @@ class DeleteSSHKey : FullScreenDialogFragment() { bind.deleteButton.setOnClickListener { if (bind.deleteKeyConfirmation.text.toString() == keyToDelete) { KeyUtils.deleteKey(requireContext(), keyToDelete) - Toast.makeText(requireContext(), "Deleted $keyToDelete. Please Refresh Screen to see changes.", Toast.LENGTH_LONG).show() + Toast.makeText(requireContext(), "Deleted $keyToDelete.", Toast.LENGTH_LONG).show() dismiss() } } @@ -55,4 +55,13 @@ class DeleteSSHKey : FullScreenDialogFragment() { bind.deleteButton.isClickable = bool } + fun setOnDismissListener(dl: DialogInterface.OnDismissListener) { + dismissListener = dl + } + + override fun onDismiss(dialog: DialogInterface) { + super.onDismiss(dialog) + if (dismissListener != null) dismissListener.onDismiss(dialog) + } + } \ No newline at end of file diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHAllKeys.kt b/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHAllKeys.kt index 53d496901..987477728 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHAllKeys.kt +++ b/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHAllKeys.kt @@ -3,6 +3,7 @@ package io.treehouses.remote.Fragments.DialogFragments import android.content.ClipData import android.content.ClipboardManager import android.content.Context +import android.content.DialogInterface import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -92,6 +93,7 @@ class SSHAllKeys : FullScreenDialogFragment(), KeyMenuListener { putString(DeleteSSHKey.KEY_TO_DELETE, allKeys[position].nickname) } } + dialog.setOnDismissListener(DialogInterface.OnDismissListener { setUpKeys() }) dialog.show(parentFragmentManager, "Delete_key") }