aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-19 23:38:09 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 23:38:09 +0200
commit2240066bbe697ae4d32a40811a246132898a35ef (patch)
tree6b17c731ca361d282596d9ec3b670fb3f3c4a693 /src
parent480b1cde810e0ed2afc6ea424fb36fd973ae24b9 (diff)
Remove device list from EditAccount
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java22
-rw-r--r--src/main/res/layout/activity_edit_account.xml43
2 files changed, 0 insertions, 65 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 1f5b76a3..2b352f03 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -62,14 +62,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
private TextView mSessionEst;
private TextView mOtrFingerprint;
private TextView mAxolotlFingerprint;
- private TextView mAxolotlDevicelist;
private ImageView mAvatar;
private RelativeLayout mOtrFingerprintBox;
private RelativeLayout mAxolotlFingerprintBox;
- private RelativeLayout mAxolotlDevicelistBox;
private ImageButton mOtrFingerprintToClipboardButton;
private ImageButton mAxolotlFingerprintToClipboardButton;
- private ImageButton mWipeAxolotlPepButton;
private ImageButton mRegenerateAxolotlKeyButton;
private LinearLayout keys;
private LinearLayout keysCard;
@@ -330,9 +327,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
this.mAxolotlFingerprintBox = (RelativeLayout) findViewById(R.id.axolotl_fingerprint_box);
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);
- this.mWipeAxolotlPepButton = (ImageButton) findViewById(R.id.action_wipe_axolotl_pep);
this.keysCard = (LinearLayout) findViewById(R.id.other_device_keys_card);
this.keys = (LinearLayout) findViewById(R.id.other_device_keys);
this.mSaveButton = (Button) findViewById(R.id.save_button);
@@ -533,22 +527,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
} else {
this.mOtrFingerprintBox.setVisibility(View.GONE);
}
- final Set<Integer> ownDevices = this.mAccount.getAxolotlService().getOwnDeviceIds();
- if (ownDevices != null && !ownDevices.isEmpty()) {
- this.mAxolotlDevicelistBox.setVisibility(View.VISIBLE);
- this.mAxolotlDevicelist.setText(TextUtils.join(", ", ownDevices));
- this.mWipeAxolotlPepButton
- .setVisibility(View.VISIBLE);
- this.mWipeAxolotlPepButton
- .setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(final View v) {
- showWipePepDialog();
- }
- });
- } else {
- this.mAxolotlDevicelistBox.setVisibility(View.GONE);
- }
final String axolotlFingerprint = this.mAccount.getAxolotlService().getOwnPublicKey().getFingerprint();
if (axolotlFingerprint != null) {
this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE);
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 3d65365d..5034f734 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -400,49 +400,6 @@
</LinearLayout>
</RelativeLayout>
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/axolotl_devices_box"
- android:layout_marginTop="32dp">
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/action_wipe_axolotl_pep"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/axolotl_devicelist"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:text="@string/axolotl_devicelist"/>
- </LinearLayout>
-
- <ImageButton
- android:id="@+id/action_wipe_axolotl_pep"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentRight="true"
- android:background="?android:selectableItemBackground"
- android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_remove"
- android:visibility="visible"
- android:contentDescription="@string/wipe_axolotl_pep"/>
-
-
- </RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/other_device_keys_card"