Skip to content

feat(setup-encryption-dialog): debug copy button #17312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −0
Open

feat(setup-encryption-dialog): debug copy button #17312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...main/java/com/owncloud/android/ui/dialog/setupEncryption/SetupEncryptionDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import com.nextcloud.client.account.User
import com.nextcloud.client.di.Injectable
import com.nextcloud.client.network.ClientFactory
import com.nextcloud.utils.extensions.getParcelableArgument
import com.owncloud.android.BuildConfig
import com.owncloud.android.R
import com.owncloud.android.databinding.SetupEncryptionDialogBinding
import com.owncloud.android.datamodel.ArbitraryDataProvider
Expand All @@ -34,6 +35,7 @@ import com.owncloud.android.lib.resources.users.GetPublicKeyRemoteOperation
import com.owncloud.android.lib.resources.users.GetServerPublicKeyRemoteOperation
import com.owncloud.android.lib.resources.users.SendCSRRemoteOperation
import com.owncloud.android.lib.resources.users.StorePrivateKeyRemoteOperation
import com.owncloud.android.utils.ClipboardUtil
import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.EncryptionUtils
import com.owncloud.android.utils.crypto.CryptoHelper
Expand Down Expand Up @@ -237,6 +239,7 @@ class SetupEncryptionDialogFragment :
}

private fun generateKey() {
binding.copyPassphraseButton.visibility = View.GONE
binding.encryptionPassphrase.visibility = View.GONE
positiveButton?.visibility = View.GONE
negativeButton?.visibility = View.GONE
Expand Down Expand Up @@ -499,6 +502,8 @@ class SetupEncryptionDialogFragment :
binding.encryptionPassphrase.text = generateMnemonicString(true)
binding.encryptionPassphrase.visibility = View.VISIBLE

setupCopyPassphraseButton()

positiveButton?.setText(R.string.end_to_end_encryption_confirm_button)
positiveButton?.visibility = View.VISIBLE
negativeButton?.visibility = View.VISIBLE
Expand All @@ -512,6 +517,17 @@ class SetupEncryptionDialogFragment :
keyResult = KEY_GENERATE
}

private fun setupCopyPassphraseButton() {
if (!BuildConfig.DEBUG) {
return
}

binding.copyPassphraseButton.visibility = View.VISIBLE
binding.copyPassphraseButton.setOnClickListener {
ClipboardUtil.copyToClipboard(requireActivity(), binding.encryptionPassphrase.text.toString())
}
}

@VisibleForTesting
fun errorSavingKeys() {
if (dialog == null) {
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/res/layout/setup_encryption_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@
tools:text="@string/placeholder_passphrase"
tools:visibility="visible" />

<com.google.android.material.button.MaterialButton
android:id="@+id/copy_passphrase_button"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/common_copy"
app:icon="@drawable/ic_content_copy"
android:visibility="gone"
tools:visibility="visible" />

<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
android:layout_width="match_parent"
Expand Down
Loading