diff --git a/res/values/strings.xml b/res/values/strings.xml index de7d972d0f..ec1ab59d4f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1540,6 +1540,7 @@ Looks like you don\'t have any conversations yet. Get started by messaging a friend. + Copied to Clipboard Share Public Key Show Seed Your Seed diff --git a/src/org/thoughtcrime/securesms/loki/KeyPairActivity.kt b/src/org/thoughtcrime/securesms/loki/KeyPairActivity.kt index 9ddd92946b..18d449f167 100644 --- a/src/org/thoughtcrime/securesms/loki/KeyPairActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/KeyPairActivity.kt @@ -111,7 +111,7 @@ class KeyPairActivity : BaseActionBarActivity() { // region Interaction private fun copy() { val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - val clip = ClipData.newPlainText("mnemonic", mnemonic) + val clip = ClipData.newPlainText("Mnemonic", mnemonic) clipboard.primaryClip = clip Toast.makeText(this, R.string.activity_key_pair_mnemonic_copied_message, Toast.LENGTH_SHORT).show() } diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java index 2c040f841d..78e50e293b 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java @@ -1,6 +1,8 @@ package org.thoughtcrime.securesms.preferences.widgets; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Context; import android.graphics.Outline; import android.os.Build; @@ -14,15 +16,18 @@ import android.view.ViewOutlineProvider; import android.view.ViewTreeObserver; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import com.lelloman.identicon.drawable.ClassicIdenticonDrawable; -import network.loki.messenger.R; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.util.TextSecurePreferences; +import network.loki.messenger.R; + public class ProfilePreference extends Preference { + private View containerView; private ImageView avatarView; private TextView profileNameView; private TextView profileNumberView; @@ -55,6 +60,8 @@ public class ProfilePreference extends Preference { @Override public void onBindViewHolder(PreferenceViewHolder viewHolder) { super.onBindViewHolder(viewHolder); + + containerView = viewHolder.itemView; avatarView = (ImageView)viewHolder.findViewById(R.id.avatar); profileNameView = (TextView)viewHolder.findViewById(R.id.profile_name); profileNumberView = (TextView)viewHolder.findViewById(R.id.number); @@ -69,6 +76,15 @@ public class ProfilePreference extends Preference { final Address localAddress = Address.fromSerialized(userHexEncodedPublicKey); final String profileName = TextSecurePreferences.getProfileName(getContext()); + Context context = getContext(); + containerView.setOnLongClickListener(v -> { + ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); + ClipData clip = ClipData.newPlainText("Public Key", userHexEncodedPublicKey); + clipboard.setPrimaryClip(clip); + Toast.makeText(context, R.string.activity_settings_public_key_copied_message, Toast.LENGTH_SHORT).show(); + return true; + }); + avatarView.setOutlineProvider(new ViewOutlineProvider() { @Override