From d61e4cce1075e3561406be96b402def5f90dcd58 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 13 Oct 2014 14:36:19 +0200 Subject: reworked muc details and contact details a bit --- src/eu/siacs/conversations/ui/EditAccountActivity.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/eu/siacs/conversations/ui/EditAccountActivity.java') diff --git a/src/eu/siacs/conversations/ui/EditAccountActivity.java b/src/eu/siacs/conversations/ui/EditAccountActivity.java index 0ec38547..1543d740 100644 --- a/src/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/eu/siacs/conversations/ui/EditAccountActivity.java @@ -17,6 +17,7 @@ import android.widget.EditText; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; import eu.siacs.conversations.R; @@ -43,7 +44,7 @@ public class EditAccountActivity extends XmppActivity { private TextView mServerInfoPep; private TextView mSessionEst; private TextView mOtrFingerprint; - private TextView mOtrFingerprintHeadline; + private RelativeLayout mOtrFingerprintBox; private ImageButton mOtrFingerprintToClipboardButton; private String jidToEdit; @@ -277,7 +278,7 @@ public class EditAccountActivity extends XmppActivity { this.mServerInfoSm = (TextView) findViewById(R.id.server_info_sm); this.mServerInfoPep = (TextView) findViewById(R.id.server_info_pep); this.mOtrFingerprint = (TextView) findViewById(R.id.otr_fingerprint); - this.mOtrFingerprintHeadline = (TextView) findViewById(R.id.otr_fingerprint_headline); + this.mOtrFingerprintBox = (RelativeLayout) findViewById(R.id.otr_fingerprint_box); this.mOtrFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard); this.mSaveButton = (Button) findViewById(R.id.save_button); this.mCancelButton = (Button) findViewById(R.id.cancel_button); @@ -378,8 +379,7 @@ public class EditAccountActivity extends XmppActivity { final String fingerprint = this.mAccount .getOtrFingerprint(xmppConnectionService); if (fingerprint != null) { - this.mOtrFingerprintHeadline.setVisibility(View.VISIBLE); - this.mOtrFingerprint.setVisibility(View.VISIBLE); + this.mOtrFingerprintBox.setVisibility(View.VISIBLE); this.mOtrFingerprint.setText(fingerprint); this.mOtrFingerprintToClipboardButton .setVisibility(View.VISIBLE); @@ -398,9 +398,7 @@ public class EditAccountActivity extends XmppActivity { } }); } else { - this.mOtrFingerprintToClipboardButton.setVisibility(View.GONE); - this.mOtrFingerprint.setVisibility(View.GONE); - this.mOtrFingerprintHeadline.setVisibility(View.GONE); + this.mOtrFingerprintBox.setVisibility(View.GONE); } } else { if (this.mAccount.errorStatus()) { -- cgit v1.2.3 From d73a77643d7923cae0789c5ed9f6a2a4cf41385f Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 23 Oct 2014 21:27:41 +0200 Subject: context menu for messages. allow to resend single messages --- src/eu/siacs/conversations/ui/EditAccountActivity.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/eu/siacs/conversations/ui/EditAccountActivity.java') diff --git a/src/eu/siacs/conversations/ui/EditAccountActivity.java b/src/eu/siacs/conversations/ui/EditAccountActivity.java index 1543d740..89c06592 100644 --- a/src/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/eu/siacs/conversations/ui/EditAccountActivity.java @@ -389,7 +389,7 @@ public class EditAccountActivity extends XmppActivity { @Override public void onClick(View v) { - if (OtrFingerprintToClipBoard(fingerprint)) { + if (copyTextToClipboard(fingerprint,R.string.otr_fingerprint)) { Toast.makeText( EditAccountActivity.this, R.string.toast_message_otr_fingerprint, @@ -409,15 +409,4 @@ public class EditAccountActivity extends XmppActivity { this.mStats.setVisibility(View.GONE); } } - - private boolean OtrFingerprintToClipBoard(String fingerprint) { - ClipboardManager mClipBoardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); - String label = getResources().getString(R.string.otr_fingerprint); - if (mClipBoardManager != null) { - ClipData mClipData = ClipData.newPlainText(label, fingerprint); - mClipBoardManager.setPrimaryClip(mClipData); - return true; - } - return false; - } } -- cgit v1.2.3 From 8fb898541286d737491ac156e8b327b534d4e2a3 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 24 Oct 2014 19:30:03 +0200 Subject: added message option to download images --- src/eu/siacs/conversations/ui/EditAccountActivity.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/eu/siacs/conversations/ui/EditAccountActivity.java') diff --git a/src/eu/siacs/conversations/ui/EditAccountActivity.java b/src/eu/siacs/conversations/ui/EditAccountActivity.java index 89c06592..58ca49cc 100644 --- a/src/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/eu/siacs/conversations/ui/EditAccountActivity.java @@ -1,8 +1,6 @@ package eu.siacs.conversations.ui; import android.app.PendingIntent; -import android.content.ClipData; -import android.content.ClipboardManager; import android.content.Intent; import android.os.Bundle; import android.text.Editable; -- cgit v1.2.3