Remove device list from EditAccount
This commit is contained in:
parent
480b1cde81
commit
2240066bbe
|
@ -62,14 +62,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||||
private TextView mSessionEst;
|
private TextView mSessionEst;
|
||||||
private TextView mOtrFingerprint;
|
private TextView mOtrFingerprint;
|
||||||
private TextView mAxolotlFingerprint;
|
private TextView mAxolotlFingerprint;
|
||||||
private TextView mAxolotlDevicelist;
|
|
||||||
private ImageView mAvatar;
|
private ImageView mAvatar;
|
||||||
private RelativeLayout mOtrFingerprintBox;
|
private RelativeLayout mOtrFingerprintBox;
|
||||||
private RelativeLayout mAxolotlFingerprintBox;
|
private RelativeLayout mAxolotlFingerprintBox;
|
||||||
private RelativeLayout mAxolotlDevicelistBox;
|
|
||||||
private ImageButton mOtrFingerprintToClipboardButton;
|
private ImageButton mOtrFingerprintToClipboardButton;
|
||||||
private ImageButton mAxolotlFingerprintToClipboardButton;
|
private ImageButton mAxolotlFingerprintToClipboardButton;
|
||||||
private ImageButton mWipeAxolotlPepButton;
|
|
||||||
private ImageButton mRegenerateAxolotlKeyButton;
|
private ImageButton mRegenerateAxolotlKeyButton;
|
||||||
private LinearLayout keys;
|
private LinearLayout keys;
|
||||||
private LinearLayout keysCard;
|
private LinearLayout keysCard;
|
||||||
|
@ -330,9 +327,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||||
this.mAxolotlFingerprintBox = (RelativeLayout) findViewById(R.id.axolotl_fingerprint_box);
|
this.mAxolotlFingerprintBox = (RelativeLayout) findViewById(R.id.axolotl_fingerprint_box);
|
||||||
this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_axolotl_to_clipboard);
|
this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_axolotl_to_clipboard);
|
||||||
this.mRegenerateAxolotlKeyButton = (ImageButton) findViewById(R.id.action_regenerate_axolotl_key);
|
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.keysCard = (LinearLayout) findViewById(R.id.other_device_keys_card);
|
||||||
this.keys = (LinearLayout) findViewById(R.id.other_device_keys);
|
this.keys = (LinearLayout) findViewById(R.id.other_device_keys);
|
||||||
this.mSaveButton = (Button) findViewById(R.id.save_button);
|
this.mSaveButton = (Button) findViewById(R.id.save_button);
|
||||||
|
@ -533,22 +527,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||||
} else {
|
} else {
|
||||||
this.mOtrFingerprintBox.setVisibility(View.GONE);
|
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();
|
final String axolotlFingerprint = this.mAccount.getAxolotlService().getOwnPublicKey().getFingerprint();
|
||||||
if (axolotlFingerprint != null) {
|
if (axolotlFingerprint != null) {
|
||||||
this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE);
|
this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE);
|
||||||
|
|
|
@ -400,49 +400,6 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</RelativeLayout>
|
</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>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/other_device_keys_card"
|
android:id="@+id/other_device_keys_card"
|
||||||
|
|
Loading…
Reference in New Issue