switch account activity to card view. started using data binder
This commit is contained in:
Daniel Gultsch
parent
1c441a57e8
commit
d0e58330e9
|
|
@ -5,6 +5,7 @@ import android.content.ActivityNotFoundException;
|
|||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.databinding.DataBindingUtil;
|
||||
import android.graphics.Bitmap;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
|
|
@ -50,6 +51,7 @@ import eu.siacs.conversations.Config;
|
|||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
|
||||
import eu.siacs.conversations.databinding.ActivityEditAccountBinding;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.services.BarcodeProvider;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
|
|
@ -74,7 +76,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched {
|
||||
|
||||
private static final int REQUEST_DATA_SAVER = 0x37af244;
|
||||
private AutoCompleteTextView mAccountJid;
|
||||
private TextInputLayout mAccountJidLayout;
|
||||
private EditText mPassword;
|
||||
private TextInputLayout mPasswordLayout;
|
||||
|
|
@ -82,12 +83,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
private Button mCancelButton;
|
||||
private Button mSaveButton;
|
||||
private Button mDisableOsOptimizationsButton;
|
||||
private TextView mDisableOsOptimizationsHeadline;
|
||||
private TextView getmDisableOsOptimizationsBody;
|
||||
private TableLayout mMoreTable;
|
||||
|
||||
private LinearLayout mStats;
|
||||
private RelativeLayout mOsOptimizations;
|
||||
private TextView mServerInfoSm;
|
||||
private TextView mServerInfoRosterVersion;
|
||||
private TextView mServerInfoCarbons;
|
||||
|
|
@ -112,7 +110,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
private ImageButton mAxolotlFingerprintToClipboardButton;
|
||||
private ImageButton mPgpDeleteFingerprintButton;
|
||||
private LinearLayout keys;
|
||||
private LinearLayout keysCard;
|
||||
private LinearLayout mNamePort;
|
||||
private EditText mHostname;
|
||||
private TextInputLayout mHostnameLayout;
|
||||
|
|
@ -146,15 +143,15 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED && !accountInfoEdited()) {
|
||||
mAccount.setOption(Account.OPTION_DISABLED, false);
|
||||
if (!xmppConnectionService.updateAccount(mAccount)) {
|
||||
Toast.makeText(EditAccountActivity.this,R.string.unable_to_update_account,Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(EditAccountActivity.this, R.string.unable_to_update_account, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
return;
|
||||
}
|
||||
final boolean registerNewAccount = mRegisterNew.isChecked() && !Config.DISALLOW_REGISTRATION_IN_UI;
|
||||
if (mUsernameMode && mAccountJid.getText().toString().contains("@")) {
|
||||
if (mUsernameMode && binding.accountJid.getText().toString().contains("@")) {
|
||||
mAccountJidLayout.setError(getString(R.string.invalid_username));
|
||||
removeErrorsOnAllBut(mAccountJidLayout);
|
||||
mAccountJid.requestFocus();
|
||||
binding.accountJid.requestFocus();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -168,7 +165,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url.toString())));
|
||||
return;
|
||||
} catch (ActivityNotFoundException e) {
|
||||
Toast.makeText(EditAccountActivity.this,R.string.application_found_to_open_website,Toast.LENGTH_SHORT);
|
||||
Toast.makeText(EditAccountActivity.this, R.string.application_found_to_open_website, Toast.LENGTH_SHORT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -176,9 +173,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
final Jid jid;
|
||||
try {
|
||||
if (mUsernameMode) {
|
||||
jid = Jid.fromParts(mAccountJid.getText().toString(), getUserModeDomain(), null);
|
||||
jid = Jid.fromParts(binding.accountJid.getText().toString(), getUserModeDomain(), null);
|
||||
} else {
|
||||
jid = Jid.fromString(mAccountJid.getText().toString());
|
||||
jid = Jid.fromString(binding.accountJid.getText().toString());
|
||||
}
|
||||
} catch (final InvalidJidException e) {
|
||||
if (mUsernameMode) {
|
||||
|
|
@ -186,15 +183,15 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
} else {
|
||||
mAccountJidLayout.setError(getString(R.string.invalid_jid));
|
||||
}
|
||||
mAccountJid.requestFocus();
|
||||
binding.accountJid.requestFocus();
|
||||
removeErrorsOnAllBut(mAccountJidLayout);
|
||||
return;
|
||||
}
|
||||
String hostname = null;
|
||||
int numericPort = 5222;
|
||||
if (mShowOptions) {
|
||||
hostname = mHostname.getText().toString().replaceAll("\\s","");
|
||||
final String port = mPort.getText().toString().replaceAll("\\s","");
|
||||
hostname = mHostname.getText().toString().replaceAll("\\s", "");
|
||||
final String port = mPort.getText().toString().replaceAll("\\s", "");
|
||||
if (hostname.contains(" ")) {
|
||||
mHostnameLayout.setError(getString(R.string.not_valid_hostname));
|
||||
mHostname.requestFocus();
|
||||
|
|
@ -225,7 +222,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
mAccountJidLayout.setError(getString(R.string.invalid_jid));
|
||||
}
|
||||
removeErrorsOnAllBut(mAccountJidLayout);
|
||||
mAccountJid.requestFocus();
|
||||
binding.accountJid.requestFocus();
|
||||
return;
|
||||
}
|
||||
if (mAccount != null) {
|
||||
|
|
@ -239,14 +236,14 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
mAccount.setPassword(password);
|
||||
mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
|
||||
if (!xmppConnectionService.updateAccount(mAccount)) {
|
||||
Toast.makeText(EditAccountActivity.this,R.string.unable_to_update_account,Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(EditAccountActivity.this, R.string.unable_to_update_account, Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (xmppConnectionService.findAccountByJid(jid) != null) {
|
||||
mAccountJidLayout.setError(getString(R.string.account_already_exists));
|
||||
removeErrorsOnAllBut(mAccountJidLayout);
|
||||
mAccountJid.requestFocus();
|
||||
binding.accountJid.requestFocus();
|
||||
return;
|
||||
}
|
||||
mAccount = new Account(jid.toBareJid(), password);
|
||||
|
|
@ -285,6 +282,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
private Button mClearDevicesButton;
|
||||
private XmppUri pendingUri = null;
|
||||
private boolean mUseTor;
|
||||
private ActivityEditAccountBinding binding;
|
||||
|
||||
public void refreshUiReal() {
|
||||
invalidateOptionsMenu();
|
||||
|
|
@ -379,7 +377,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
resId = mUseTor ? R.string.hostname_or_onion : R.string.hostname_example;
|
||||
}
|
||||
final int res = resId;
|
||||
new Handler().postDelayed(() -> et.setHint(res),200);
|
||||
new Handler().postDelayed(() -> et.setHint(res), 200);
|
||||
} else {
|
||||
et.setHint(null);
|
||||
}
|
||||
|
|
@ -433,17 +431,17 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
|
||||
@Override
|
||||
protected void processFingerprintVerification(XmppUri uri) {
|
||||
processFingerprintVerification(uri,true);
|
||||
processFingerprintVerification(uri, true);
|
||||
}
|
||||
|
||||
|
||||
protected void processFingerprintVerification(XmppUri uri, boolean showWarningToast) {
|
||||
if (mAccount != null && mAccount.getJid().toBareJid().equals(uri.getJid()) && uri.hasFingerprints()) {
|
||||
if (xmppConnectionService.verifyFingerprints(mAccount,uri.getFingerprints())) {
|
||||
Toast.makeText(this,R.string.verified_fingerprints,Toast.LENGTH_SHORT).show();
|
||||
if (xmppConnectionService.verifyFingerprints(mAccount, uri.getFingerprints())) {
|
||||
Toast.makeText(this, R.string.verified_fingerprints, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
} else if (showWarningToast) {
|
||||
Toast.makeText(this,R.string.invalid_barcode,Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(this, R.string.invalid_barcode, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -459,7 +457,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.mSaveButton.setEnabled(true);
|
||||
this.mSaveButton.setTextColor(getPrimaryTextColor());
|
||||
} else if (mAccount != null
|
||||
&& (mAccount.getStatus() == Account.State.CONNECTING || mAccount.getStatus() == Account.State.REGISTRATION_SUCCESSFUL|| mFetchingAvatar)) {
|
||||
&& (mAccount.getStatus() == Account.State.CONNECTING || mAccount.getStatus() == Account.State.REGISTRATION_SUCCESSFUL || mFetchingAvatar)) {
|
||||
this.mSaveButton.setEnabled(false);
|
||||
this.mSaveButton.setTextColor(getSecondaryTextColor());
|
||||
this.mSaveButton.setText(R.string.account_status_connecting);
|
||||
|
|
@ -515,7 +513,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
} else {
|
||||
unmodified = this.mAccount.getJid().toBareJid().toString();
|
||||
}
|
||||
return !unmodified.equals(this.mAccountJid.getText().toString());
|
||||
return !unmodified.equals(this.binding.accountJid.getText().toString());
|
||||
}
|
||||
|
||||
protected boolean passwordChangedInMagicCreateMode() {
|
||||
|
|
@ -542,10 +540,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.mSavedInstanceAccount = savedInstanceState.getString("account");
|
||||
this.mSavedInstanceInit = savedInstanceState.getBoolean("initMode", false);
|
||||
}
|
||||
setContentView(R.layout.activity_edit_account);
|
||||
this.mAccountJid = (AutoCompleteTextView) findViewById(R.id.account_jid);
|
||||
this.mAccountJid.addTextChangedListener(this.mTextWatcher);
|
||||
this.mAccountJid.setOnFocusChangeListener(this.mEditTextFocusListener);
|
||||
this.binding = DataBindingUtil.setContentView(this, R.layout.activity_edit_account);
|
||||
binding.accountJid.addTextChangedListener(this.mTextWatcher);
|
||||
binding.accountJid.setOnFocusChangeListener(this.mEditTextFocusListener);
|
||||
this.mAccountJidLayout = (TextInputLayout) findViewById(R.id.account_jid_layout);
|
||||
this.mPassword = (EditText) findViewById(R.id.account_password);
|
||||
this.mPassword.addTextChangedListener(this.mTextWatcher);
|
||||
|
|
@ -553,10 +550,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.mAvatar = (ImageView) findViewById(R.id.avater);
|
||||
this.mAvatar.setOnClickListener(this.mAvatarClickListener);
|
||||
this.mRegisterNew = (CheckBox) findViewById(R.id.account_register_new);
|
||||
this.mStats = (LinearLayout) findViewById(R.id.stats);
|
||||
this.mOsOptimizations = (RelativeLayout) findViewById(R.id.os_optimization);
|
||||
this.mDisableOsOptimizationsButton = (Button) findViewById(R.id.os_optimization_disable);
|
||||
this.mDisableOsOptimizationsHeadline = (TextView) findViewById(R.id.os_optimization_headline);
|
||||
this.getmDisableOsOptimizationsBody = (TextView) findViewById(R.id.os_optimization_body);
|
||||
this.mSessionEst = (TextView) findViewById(R.id.session_est);
|
||||
this.mServerInfoRosterVersion = (TextView) findViewById(R.id.server_info_roster_version);
|
||||
|
|
@ -581,13 +575,12 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.mAxolotlFingerprintBox = (RelativeLayout) findViewById(R.id.axolotl_fingerprint_box);
|
||||
this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_axolotl_to_clipboard);
|
||||
this.mOwnFingerprintDesc = (TextView) findViewById(R.id.own_fingerprint_desc);
|
||||
this.keysCard = (LinearLayout) findViewById(R.id.other_device_keys_card);
|
||||
this.keys = (LinearLayout) findViewById(R.id.other_device_keys);
|
||||
this.mNamePort = (LinearLayout) findViewById(R.id.name_port);
|
||||
this.mHostname = (EditText) findViewById(R.id.hostname);
|
||||
this.mHostname.addTextChangedListener(mTextWatcher);
|
||||
this.mHostname.setOnFocusChangeListener(mEditTextFocusListener);
|
||||
this.mHostnameLayout = (TextInputLayout)findViewById(R.id.hostname_layout);
|
||||
this.mHostnameLayout = (TextInputLayout) findViewById(R.id.hostname_layout);
|
||||
this.mClearDevicesButton = (Button) findViewById(R.id.clear_devices);
|
||||
this.mClearDevicesButton.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
|
|
@ -598,7 +591,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.mPort = (EditText) findViewById(R.id.port);
|
||||
this.mPort.setText("5222");
|
||||
this.mPort.addTextChangedListener(mTextWatcher);
|
||||
this.mPortLayout = (TextInputLayout)findViewById(R.id.port_layout);
|
||||
this.mPortLayout = (TextInputLayout) findViewById(R.id.port_layout);
|
||||
this.mSaveButton = (Button) findViewById(R.id.save_button);
|
||||
this.mCancelButton = (Button) findViewById(R.id.cancel_button);
|
||||
this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
|
||||
|
|
@ -768,12 +761,12 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.mCancelButton.setTextColor(getSecondaryTextColor());
|
||||
}
|
||||
if (mUsernameMode) {
|
||||
this.mAccountJid.setHint(R.string.username_hint);
|
||||
this.binding.accountJid.setHint(R.string.username_hint);
|
||||
} else {
|
||||
final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
|
||||
R.layout.simple_list_item,
|
||||
xmppConnectionService.getKnownHosts());
|
||||
this.mAccountJid.setAdapter(mKnownHostsAdapter);
|
||||
this.binding.accountJid.setAdapter(mKnownHostsAdapter);
|
||||
}
|
||||
|
||||
if (pendingUri != null) {
|
||||
|
|
@ -831,7 +824,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
|
||||
private void shareBarcode() {
|
||||
Intent intent = new Intent(Intent.ACTION_SEND);
|
||||
intent.putExtra(Intent.EXTRA_STREAM,BarcodeProvider.getUriForAccount(this,mAccount));
|
||||
intent.putExtra(Intent.EXTRA_STREAM, BarcodeProvider.getUriForAccount(this, mAccount));
|
||||
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
intent.setType("image/png");
|
||||
startActivity(Intent.createChooser(intent, getText(R.string.share_with)));
|
||||
|
|
@ -856,7 +849,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
|
||||
private void changePresence() {
|
||||
Intent intent = new Intent(this, SetPresenceActivity.class);
|
||||
intent.putExtra(SetPresenceActivity.EXTRA_ACCOUNT,mAccount.getJid().toBareJid().toString());
|
||||
intent.putExtra(SetPresenceActivity.EXTRA_ACCOUNT, mAccount.getJid().toBareJid().toString());
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
|
|
@ -869,11 +862,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
|
||||
private void updateAccountInformation(boolean init) {
|
||||
if (init) {
|
||||
this.mAccountJid.getEditableText().clear();
|
||||
this.binding.accountJid.getEditableText().clear();
|
||||
if (mUsernameMode) {
|
||||
this.mAccountJid.getEditableText().append(this.mAccount.getJid().getLocalpart());
|
||||
this.binding.accountJid.getEditableText().append(this.mAccount.getJid().getLocalpart());
|
||||
} else {
|
||||
this.mAccountJid.getEditableText().append(this.mAccount.getJid().toBareJid().toString());
|
||||
this.binding.accountJid.getEditableText().append(this.mAccount.getJid().toBareJid().toString());
|
||||
}
|
||||
this.mPassword.getEditableText().clear();
|
||||
this.mPassword.getEditableText().append(this.mAccount.getPassword());
|
||||
|
|
@ -886,9 +879,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
}
|
||||
|
||||
final boolean editable = !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY);
|
||||
this.mAccountJid.setEnabled(editable);
|
||||
this.mAccountJid.setFocusable(editable);
|
||||
this.mAccountJid.setFocusableInTouchMode(editable);
|
||||
this.binding.accountJid.setEnabled(editable);
|
||||
this.binding.accountJid.setFocusable(editable);
|
||||
this.binding.accountJid.setFocusableInTouchMode(editable);
|
||||
if (editable) {
|
||||
this.mPassword.setCustomSelectionActionModeCallback(null);
|
||||
} else {
|
||||
|
|
@ -910,10 +903,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
}
|
||||
if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
|
||||
Features features = this.mAccount.getXmppConnection().getFeatures();
|
||||
this.mStats.setVisibility(View.VISIBLE);
|
||||
this.binding.stats.setVisibility(View.VISIBLE);
|
||||
boolean showBatteryWarning = !xmppConnectionService.getPushManagementService().available(mAccount) && isOptimizingBattery();
|
||||
boolean showDataSaverWarning = isAffectedByDataSaver();
|
||||
showOsOptimizationWarning(showBatteryWarning,showDataSaverWarning);
|
||||
showOsOptimizationWarning(showBatteryWarning, showDataSaverWarning);
|
||||
this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()
|
||||
.getLastSessionEstablished()));
|
||||
if (features.rosterVersioning()) {
|
||||
|
|
@ -974,18 +967,8 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
}
|
||||
final long pgpKeyId = this.mAccount.getPgpId();
|
||||
if (pgpKeyId != 0 && Config.supportOpenPgp()) {
|
||||
OnClickListener openPgp = new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
launchOpenKeyChain(pgpKeyId);
|
||||
}
|
||||
};
|
||||
OnClickListener delete = new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
showDeletePgpDialog();
|
||||
}
|
||||
};
|
||||
OnClickListener openPgp = view -> launchOpenKeyChain(pgpKeyId);
|
||||
OnClickListener delete = view -> showDeletePgpDialog();
|
||||
this.mPgpFingerprintBox.setVisibility(View.VISIBLE);
|
||||
this.mPgpFingerprint.setText(OpenPgpUtils.convertKeyIdToHex(pgpKeyId));
|
||||
this.mPgpFingerprint.setOnClickListener(openPgp);
|
||||
|
|
@ -1004,21 +987,14 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
}
|
||||
this.mOtrFingerprintBox.setVisibility(View.VISIBLE);
|
||||
this.mOtrFingerprint.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
|
||||
this.mOtrFingerprintToClipboardButton
|
||||
.setVisibility(View.VISIBLE);
|
||||
this.mOtrFingerprintToClipboardButton
|
||||
.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(final View v) {
|
||||
|
||||
this.mOtrFingerprintToClipboardButton.setVisibility(View.VISIBLE);
|
||||
this.mOtrFingerprintToClipboardButton.setOnClickListener(v -> {
|
||||
if (copyTextToClipboard(CryptoHelper.prettifyFingerprint(otrFingerprint), R.string.otr_fingerprint)) {
|
||||
Toast.makeText(
|
||||
EditAccountActivity.this,
|
||||
R.string.toast_message_otr_fingerprint,
|
||||
Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
this.mOtrFingerprintBox.setVisibility(View.GONE);
|
||||
|
|
@ -1034,30 +1010,22 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.mOwnFingerprintDesc.setText(R.string.omemo_fingerprint);
|
||||
}
|
||||
this.mAxolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2)));
|
||||
this.mAxolotlFingerprintToClipboardButton
|
||||
.setVisibility(View.VISIBLE);
|
||||
this.mAxolotlFingerprintToClipboardButton
|
||||
.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(final View v) {
|
||||
copyOmemoFingerprint(ownAxolotlFingerprint);
|
||||
}
|
||||
});
|
||||
this.mAxolotlFingerprintToClipboardButton.setVisibility(View.VISIBLE);
|
||||
this.mAxolotlFingerprintToClipboardButton.setOnClickListener(v -> copyOmemoFingerprint(ownAxolotlFingerprint));
|
||||
} else {
|
||||
this.mAxolotlFingerprintBox.setVisibility(View.GONE);
|
||||
}
|
||||
boolean hasKeys = false;
|
||||
keys.removeAllViews();
|
||||
for(XmppAxolotlSession session : mAccount.getAxolotlService().findOwnSessions()) {
|
||||
for (XmppAxolotlSession session : mAccount.getAxolotlService().findOwnSessions()) {
|
||||
if (!session.getTrust().isCompromised()) {
|
||||
boolean highlight = session.getFingerprint().equals(messageFingerprint);
|
||||
addFingerprintRow(keys,session,highlight);
|
||||
addFingerprintRow(keys, session, highlight);
|
||||
hasKeys = true;
|
||||
}
|
||||
}
|
||||
if (hasKeys && Config.supportOmemo()) {
|
||||
keysCard.setVisibility(View.VISIBLE);
|
||||
this.binding.otherDeviceKeysCard.setVisibility(View.VISIBLE);
|
||||
Set<Integer> otherDevices = mAccount.getAxolotlService().getOwnDeviceIds();
|
||||
if (otherDevices == null || otherDevices.isEmpty()) {
|
||||
mClearDevicesButton.setVisibility(View.GONE);
|
||||
|
|
@ -1065,7 +1033,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
mClearDevicesButton.setVisibility(View.VISIBLE);
|
||||
}
|
||||
} else {
|
||||
keysCard.setVisibility(View.GONE);
|
||||
this.binding.otherDeviceKeysCard.setVisibility(View.GONE);
|
||||
}
|
||||
} else {
|
||||
final TextInputLayout errorLayout;
|
||||
|
|
@ -1087,12 +1055,13 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
errorLayout = null;
|
||||
}
|
||||
removeErrorsOnAllBut(errorLayout);
|
||||
this.mStats.setVisibility(View.GONE);
|
||||
this.binding.stats.setVisibility(View.GONE);
|
||||
this.binding.otherDeviceKeysCard.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
private void removeErrorsOnAllBut(TextInputLayout exception) {
|
||||
if (this.mAccountJidLayout != exception){
|
||||
if (this.mAccountJidLayout != exception) {
|
||||
this.mAccountJidLayout.setErrorEnabled(false);
|
||||
this.mAccountJidLayout.setError(null);
|
||||
}
|
||||
|
|
@ -1114,55 +1083,46 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setTitle(R.string.unpublish_pgp);
|
||||
builder.setMessage(R.string.unpublish_pgp_message);
|
||||
builder.setNegativeButton(R.string.cancel,null);
|
||||
builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
builder.setNegativeButton(R.string.cancel, null);
|
||||
builder.setPositiveButton(R.string.confirm, (dialogInterface, i) -> {
|
||||
mAccount.setPgpSignId(0);
|
||||
mAccount.unsetPgpSignature();
|
||||
xmppConnectionService.databaseBackend.updateAccount(mAccount);
|
||||
xmppConnectionService.sendPresence(mAccount);
|
||||
refreshUiReal();
|
||||
}
|
||||
});
|
||||
builder.create().show();
|
||||
}
|
||||
|
||||
private void showOsOptimizationWarning(boolean showBatteryWarning, boolean showDataSaverWarning) {
|
||||
this.mOsOptimizations.setVisibility(showBatteryWarning || showDataSaverWarning ? View.VISIBLE : View.GONE);
|
||||
this.binding.osOptimization.setVisibility(showBatteryWarning || showDataSaverWarning ? View.VISIBLE : View.GONE);
|
||||
if (showDataSaverWarning) {
|
||||
this.mDisableOsOptimizationsHeadline.setText(R.string.data_saver_enabled);
|
||||
this.binding.osOptimizationHeadline.setText(R.string.data_saver_enabled);
|
||||
this.getmDisableOsOptimizationsBody.setText(R.string.data_saver_enabled_explained);
|
||||
this.mDisableOsOptimizationsButton.setText(R.string.allow);
|
||||
this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
this.mDisableOsOptimizationsButton.setOnClickListener(v -> {
|
||||
Intent intent = new Intent(Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS);
|
||||
Uri uri = Uri.parse("package:"+getPackageName());
|
||||
Uri uri = Uri.parse("package:" + getPackageName());
|
||||
intent.setData(uri);
|
||||
try {
|
||||
startActivityForResult(intent, REQUEST_DATA_SAVER);
|
||||
} catch (ActivityNotFoundException e) {
|
||||
Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_data_saver, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
} else if (showBatteryWarning) {
|
||||
this.mDisableOsOptimizationsButton.setText(R.string.disable);
|
||||
this.mDisableOsOptimizationsHeadline.setText(R.string.battery_optimizations_enabled);
|
||||
this.binding.osOptimizationHeadline.setText(R.string.battery_optimizations_enabled);
|
||||
this.getmDisableOsOptimizationsBody.setText(R.string.battery_optimizations_enabled_explained);
|
||||
this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
this.mDisableOsOptimizationsButton.setOnClickListener(v -> {
|
||||
Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
|
||||
Uri uri = Uri.parse("package:"+getPackageName());
|
||||
Uri uri = Uri.parse("package:" + getPackageName());
|
||||
intent.setData(uri);
|
||||
try {
|
||||
startActivityForResult(intent, REQUEST_BATTERY_OP);
|
||||
} catch (ActivityNotFoundException e) {
|
||||
Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1174,12 +1134,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
builder.setMessage(getString(R.string.clear_other_devices_desc));
|
||||
builder.setNegativeButton(getString(R.string.cancel), null);
|
||||
builder.setPositiveButton(getString(R.string.accept),
|
||||
new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
mAccount.getAxolotlService().wipeOtherPepDevices();
|
||||
}
|
||||
});
|
||||
(dialog, which) -> mAccount.getAxolotlService().wipeOtherPepDevices());
|
||||
builder.create().show();
|
||||
}
|
||||
|
||||
|
|
@ -1196,13 +1151,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
|
||||
@Override
|
||||
public void onCaptchaRequested(final Account account, final String id, final Data data, final Bitmap captcha) {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if ((mCaptchaDialog != null) && mCaptchaDialog.isShowing()) {
|
||||
runOnUiThread(() -> {
|
||||
if (mCaptchaDialog != null && mCaptchaDialog.isShowing()) {
|
||||
mCaptchaDialog.dismiss();
|
||||
}
|
||||
final AlertDialog.Builder builder = new AlertDialog.Builder(EditAccountActivity.this);
|
||||
final Builder builder = new Builder(EditAccountActivity.this);
|
||||
final View view = getLayoutInflater().inflate(R.layout.captcha, null);
|
||||
final ImageView imageView = view.findViewById(R.id.captcha);
|
||||
final EditText input = view.findViewById(R.id.input);
|
||||
|
|
@ -1212,9 +1165,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
builder.setView(view);
|
||||
|
||||
builder.setPositiveButton(getString(R.string.ok),
|
||||
new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
(dialog, which) -> {
|
||||
String rc = input.getText().toString();
|
||||
data.put("username", account.getUsername());
|
||||
data.put("password", account.getPassword());
|
||||
|
|
@ -1222,86 +1173,58 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
data.submit();
|
||||
|
||||
if (xmppConnectionServiceBound) {
|
||||
xmppConnectionService.sendCreateAccountWithCaptchaPacket(
|
||||
account, id, data);
|
||||
}
|
||||
xmppConnectionService.sendCreateAccountWithCaptchaPacket(account, id, data);
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> {
|
||||
if (xmppConnectionService != null) {
|
||||
xmppConnectionService.sendCreateAccountWithCaptchaPacket(account, null, null);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
|
||||
@Override
|
||||
public void onCancel(DialogInterface dialog) {
|
||||
builder.setOnCancelListener(dialog -> {
|
||||
if (xmppConnectionService != null) {
|
||||
xmppConnectionService.sendCreateAccountWithCaptchaPacket(account, null, null);
|
||||
}
|
||||
}
|
||||
});
|
||||
mCaptchaDialog = builder.create();
|
||||
mCaptchaDialog.show();
|
||||
input.requestFocus();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void onShowErrorToast(final int resId) {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Toast.makeText(EditAccountActivity.this, resId, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
runOnUiThread(() -> Toast.makeText(EditAccountActivity.this, resId, Toast.LENGTH_SHORT).show());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPreferencesFetched(final Element prefs) {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
runOnUiThread(() -> {
|
||||
if (mFetchingMamPrefsToast != null) {
|
||||
mFetchingMamPrefsToast.cancel();
|
||||
}
|
||||
AlertDialog.Builder builder = new Builder(EditAccountActivity.this);
|
||||
Builder builder = new Builder(EditAccountActivity.this);
|
||||
builder.setTitle(R.string.server_side_mam_prefs);
|
||||
String defaultAttr = prefs.getAttribute("default");
|
||||
final List<String> defaults = Arrays.asList("never", "roster", "always");
|
||||
final AtomicInteger choice = new AtomicInteger(Math.max(0,defaults.indexOf(defaultAttr)));
|
||||
builder.setSingleChoiceItems(R.array.mam_prefs, choice.get(), new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
choice.set(which);
|
||||
}
|
||||
});
|
||||
final AtomicInteger choice = new AtomicInteger(Math.max(0, defaults.indexOf(defaultAttr)));
|
||||
builder.setSingleChoiceItems(R.array.mam_prefs, choice.get(), (dialog, which) -> choice.set(which));
|
||||
builder.setNegativeButton(R.string.cancel, null);
|
||||
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
prefs.setAttribute("default",defaults.get(choice.get()));
|
||||
builder.setPositiveButton(R.string.ok, (dialog, which) -> {
|
||||
prefs.setAttribute("default", defaults.get(choice.get()));
|
||||
xmppConnectionService.pushMamPreferences(mAccount, prefs);
|
||||
}
|
||||
});
|
||||
builder.create().show();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPreferencesFetchFailed() {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
runOnUiThread(() -> {
|
||||
if (mFetchingMamPrefsToast != null) {
|
||||
mFetchingMamPrefsToast.cancel();
|
||||
}
|
||||
Toast.makeText(EditAccountActivity.this,R.string.unable_to_fetch_mam_prefs,Toast.LENGTH_LONG).show();
|
||||
}
|
||||
Toast.makeText(EditAccountActivity.this, R.string.unable_to_fetch_mam_prefs, Toast.LENGTH_LONG).show();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?attr/color_background_secondary">
|
||||
|
|
@ -18,16 +20,19 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
|
||||
<android.support.v7.widget.CardView
|
||||
android:id="@+id/editor"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/activity_vertical_margin"
|
||||
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginTop="@dimen/activity_vertical_margin"
|
||||
android:background="?attr/infocard_border"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginTop="@dimen/activity_vertical_margin">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="@dimen/infocard_padding">
|
||||
|
||||
<com.makeramen.roundedimageview.RoundedImageView
|
||||
|
|
@ -37,7 +42,7 @@
|
|||
android:layout_alignParentTop="true"
|
||||
android:layout_marginRight="16dp"
|
||||
android:contentDescription="@string/account_image_description"
|
||||
app:riv_corner_radius="2dp" />
|
||||
app:riv_corner_radius="2dp"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
|
|
@ -59,7 +64,7 @@
|
|||
android:inputType="textEmailAddress"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textColorHint="?attr/color_text_secondary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
|
||||
|
|
@ -80,7 +85,7 @@
|
|||
android:inputType="textPassword"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textColorHint="?attr/color_text_secondary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -98,9 +103,9 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:id="@+id/hostname_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/hostname_layout"
|
||||
android:hint="@string/account_settings_hostname">
|
||||
|
||||
<EditText
|
||||
|
|
@ -110,7 +115,7 @@
|
|||
android:inputType="textNoSuggestions"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textColorHint="?attr/color_text_secondary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -121,9 +126,9 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<android.support.design.widget.TextInputLayout
|
||||
android:id="@+id/port_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/port_layout"
|
||||
android:hint="@string/account_settings_port">
|
||||
|
||||
<EditText
|
||||
|
|
@ -134,7 +139,7 @@
|
|||
android:maxLength="5"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textColorHint="?attr/color_text_secondary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</android.support.design.widget.TextInputLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
@ -146,11 +151,12 @@
|
|||
android:layout_marginTop="8dp"
|
||||
android:text="@string/register_account"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
<RelativeLayout
|
||||
<android.support.v7.widget.CardView
|
||||
android:id="@+id/os_optimization"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -158,11 +164,13 @@
|
|||
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginTop="@dimen/activity_vertical_margin"
|
||||
android:background="?attr/infocard_border"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/infocard_padding"
|
||||
android:visibility="gone">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="@dimen/infocard_padding">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/os_optimization_headline"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -170,7 +178,7 @@
|
|||
android:text="@string/battery_optimizations_enabled"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeHeadline"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/os_optimization_body"
|
||||
|
|
@ -181,7 +189,7 @@
|
|||
android:layout_marginTop="8dp"
|
||||
android:text="@string/battery_optimizations_enabled_explained"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/os_optimization_disable"
|
||||
|
|
@ -194,11 +202,12 @@
|
|||
android:layout_below="@+id/os_optimization_body"
|
||||
android:layout_marginRight="-8dp"
|
||||
android:text="@string/disable"
|
||||
android:textColor="@color/accent" />
|
||||
android:textColor="@color/accent"/>
|
||||
</RelativeLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
<android.support.v7.widget.CardView
|
||||
android:id="@+id/stats"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
|
|
@ -206,11 +215,14 @@
|
|||
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginTop="@dimen/activity_vertical_margin"
|
||||
android:background="?attr/infocard_border"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/infocard_padding"
|
||||
android:visibility="gone">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/infocard_padding">
|
||||
|
||||
<TableLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -229,7 +241,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_session_established"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/session_est"
|
||||
|
|
@ -239,7 +251,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
</TableLayout>
|
||||
|
|
@ -263,7 +275,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_pep"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_pep"
|
||||
|
|
@ -273,7 +285,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -287,7 +299,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_blocking"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_blocking"
|
||||
|
|
@ -297,7 +309,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -311,7 +323,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_stream_management"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_sm"
|
||||
|
|
@ -321,7 +333,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -335,7 +347,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_roster_version"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_roster_version"
|
||||
|
|
@ -345,7 +357,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -359,7 +371,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_carbon_messages"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_carbons"
|
||||
|
|
@ -369,7 +381,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -383,7 +395,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_mam"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_mam"
|
||||
|
|
@ -393,7 +405,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -407,7 +419,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_csi"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_csi"
|
||||
|
|
@ -417,7 +429,7 @@
|
|||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -432,7 +444,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_push"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_push"
|
||||
|
|
@ -441,7 +453,7 @@
|
|||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
|
|
@ -455,7 +467,7 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/server_info_http_upload"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_http_upload"
|
||||
|
|
@ -464,7 +476,7 @@
|
|||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
|
||||
|
|
@ -489,7 +501,7 @@
|
|||
android:fontFamily="monospace"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:typeface="monospace" />
|
||||
android:typeface="monospace"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/pgp_fingerprint_desc"
|
||||
|
|
@ -497,7 +509,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/openpgp_key_id"
|
||||
android:textColor="?attr/color_text_secondary"
|
||||
android:textSize="?attr/TextSizeInfo" />
|
||||
android:textSize="?attr/TextSizeInfo"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ImageButton
|
||||
|
|
@ -510,7 +522,7 @@
|
|||
android:background="?attr/selectableItemBackgroundBorderless"
|
||||
android:padding="@dimen/image_button_padding"
|
||||
android:src="?attr/icon_remove"
|
||||
android:visibility="visible" />
|
||||
android:visibility="visible"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
|
|
@ -534,7 +546,7 @@
|
|||
android:fontFamily="monospace"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:typeface="monospace" />
|
||||
android:typeface="monospace"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/otr_fingerprint_desc"
|
||||
|
|
@ -542,7 +554,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/otr_fingerprint"
|
||||
android:textColor="?attr/color_text_secondary"
|
||||
android:textSize="?attr/TextSizeInfo" />
|
||||
android:textSize="?attr/TextSizeInfo"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ImageButton
|
||||
|
|
@ -556,7 +568,7 @@
|
|||
android:contentDescription="@string/copy_otr_clipboard_description"
|
||||
android:padding="@dimen/image_button_padding"
|
||||
android:src="?attr/icon_copy"
|
||||
android:visibility="visible" />
|
||||
android:visibility="visible"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
|
|
@ -580,7 +592,7 @@
|
|||
android:fontFamily="monospace"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:typeface="monospace" />
|
||||
android:typeface="monospace"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/own_fingerprint_desc"
|
||||
|
|
@ -588,7 +600,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/omemo_fingerprint"
|
||||
android:textColor="?attr/color_text_secondary"
|
||||
android:textSize="?attr/TextSizeInfo" />
|
||||
android:textSize="?attr/TextSizeInfo"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -608,7 +620,7 @@
|
|||
android:contentDescription="@string/copy_omemo_clipboard_description"
|
||||
android:padding="@dimen/image_button_padding"
|
||||
android:src="?attr/icon_copy"
|
||||
android:visibility="visible" />
|
||||
android:visibility="visible"/>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/action_regenerate_axolotl_key"
|
||||
|
|
@ -619,13 +631,14 @@
|
|||
android:contentDescription="@string/regenerate_omemo_key"
|
||||
android:padding="@dimen/image_button_padding"
|
||||
android:src="?attr/icon_refresh"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"/>
|
||||
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
<LinearLayout
|
||||
<android.support.v7.widget.CardView
|
||||
android:id="@+id/other_device_keys_card"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -633,11 +646,14 @@
|
|||
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginTop="@dimen/activity_vertical_margin"
|
||||
android:background="?attr/infocard_border"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/infocard_padding"
|
||||
android:visibility="gone">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/infocard_padding">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/other_device_keys_title"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -645,7 +661,7 @@
|
|||
android:text="@string/other_devices"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeHeadline"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/other_device_keys"
|
||||
|
|
@ -662,8 +678,9 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:text="@string/clear_other_devices"
|
||||
android:textColor="@color/accent" />
|
||||
android:textColor="@color/accent"/>
|
||||
</LinearLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
||||
|
|
@ -684,14 +701,14 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="?attr/color_text_primary" />
|
||||
android:textColor="?attr/color_text_primary"/>
|
||||
|
||||
<View
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_marginBottom="7dp"
|
||||
android:layout_marginTop="7dp"
|
||||
android:background="?attr/divider" />
|
||||
android:background="?attr/divider"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/save_button"
|
||||
|
|
@ -701,7 +718,8 @@
|
|||
android:layout_weight="1"
|
||||
android:enabled="false"
|
||||
android:text="@string/save"
|
||||
android:textColor="?attr/color_text_secondary" />
|
||||
android:textColor="?attr/color_text_secondary"/>
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
</layout>
|
||||
|
|
|
|||
Loading…
Reference in a new issue