diff options
| author | Andreas Straub <andy@strb.org> | 2015-07-10 09:49:12 +0200 |
|---|---|---|
| committer | Andreas Straub <andy@strb.org> | 2015-07-10 09:49:12 +0200 |
| commit | 235c9039e010e26bf3046fd2ae36b4d45c39cf8e (patch) | |
| tree | e6a0f56863e1dd1dad235342c29e5626fe7241af /src/main/java/eu/siacs | |
| parent | 8b08bdb3affa73360d955bd03ca0f074cb2670a1 (diff) | |
| parent | 625cab74cc7a726bb4640d9b16a2ec04ea56ae35 (diff) | |
Merge pull request #1279 from SamWhited/fix_missing_refresh_icon
Add refresh icon to v21 theme / fix fingerprint copying
Diffstat (limited to 'src/main/java/eu/siacs')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 91a9f555..6ffad64b 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -1,6 +1,5 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.PendingIntent; import android.content.DialogInterface; @@ -325,7 +324,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate this.mOtrFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard); this.mAxolotlFingerprint = (TextView) findViewById(R.id.axolotl_fingerprint); this.mAxolotlFingerprintBox = (RelativeLayout) findViewById(R.id.axolotl_fingerprint_box); - this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard); + this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_axolotl_to_clipboard); this.mRegenerateAxolotlKeyButton = (ImageButton) findViewById(R.id.action_regenerate_axolotl_key); this.mAxolotlDevicelist = (TextView) findViewById(R.id.axolotl_devicelist); this.mAxolotlDevicelistBox = (RelativeLayout) findViewById(R.id.axolotl_devices_box); |