diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/EditAccountActivity.java | 318 | ||||
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 1260 |
2 files changed, 753 insertions, 825 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 44d3d984c..d26c2123c 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -3,9 +3,9 @@ package de.pixart.messenger.ui; import android.app.AlertDialog.Builder; import android.app.PendingIntent; 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; @@ -23,7 +23,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; -import android.widget.AutoCompleteTextView; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -50,6 +49,7 @@ import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.crypto.axolotl.AxolotlService; import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +import de.pixart.messenger.databinding.ActivityEditAccountBinding; import de.pixart.messenger.entities.Account; import de.pixart.messenger.services.BarcodeProvider; import de.pixart.messenger.services.XmppConnectionService; @@ -68,12 +68,10 @@ import de.pixart.messenger.xmpp.forms.Data; import de.pixart.messenger.xmpp.jid.InvalidJidException; import de.pixart.messenger.xmpp.jid.Jid; import de.pixart.messenger.xmpp.pep.Avatar; - public class EditAccountActivity extends OmemoActivity implements OnAccountUpdate, OnUpdateBlocklist, 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; @@ -81,12 +79,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; @@ -111,7 +106,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; @@ -150,10 +144,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat 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; } @@ -175,9 +169,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) { @@ -185,7 +179,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } else { mAccountJidLayout.setError(getString(R.string.invalid_jid)); } - mAccountJid.requestFocus(); + binding.accountJid.requestFocus(); removeErrorsOnAllBut(mAccountJidLayout); return; } @@ -224,7 +218,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat mAccountJidLayout.setError(getString(R.string.invalid_jid)); } removeErrorsOnAllBut(mAccountJidLayout); - mAccountJid.requestFocus(); + binding.accountJid.requestFocus(); return; } if (registerNewAccount) { @@ -254,7 +248,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat 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); @@ -293,6 +287,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(); @@ -522,7 +517,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() { @@ -549,10 +544,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 = 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); + this.binding.accountJid.addTextChangedListener(this.mTextWatcher); + this.binding.accountJid.setOnFocusChangeListener(this.mEditTextFocusListener); this.mAccountJidLayout = (TextInputLayout) findViewById(R.id.account_jid_layout); this.mPassword = findViewById(R.id.account_password); this.mPassword.addTextChangedListener(this.mTextWatcher); @@ -560,10 +554,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat this.mAvatar = findViewById(R.id.avater); this.mAvatar.setOnClickListener(this.mAvatarClickListener); this.mRegisterNew = findViewById(R.id.account_register_new); - this.mStats = findViewById(R.id.stats); - this.mOsOptimizations = findViewById(R.id.os_optimization); this.mDisableOsOptimizationsButton = findViewById(R.id.os_optimization_disable); - this.mDisableOsOptimizationsHeadline = findViewById(R.id.os_optimization_headline); this.getmDisableOsOptimizationsBody = findViewById(R.id.os_optimization_body); this.mSessionEst = findViewById(R.id.session_est); this.mServerInfoRosterVersion = findViewById(R.id.server_info_roster_version); @@ -588,7 +579,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat this.mAxolotlFingerprintBox = findViewById(R.id.axolotl_fingerprint_box); this.mAxolotlFingerprintToClipboardButton = findViewById(R.id.action_copy_axolotl_to_clipboard); this.mOwnFingerprintDesc = findViewById(R.id.own_fingerprint_desc); - this.keysCard = findViewById(R.id.other_device_keys_card); this.keys = findViewById(R.id.other_device_keys); this.mNamePort = findViewById(R.id.name_port); this.mHostname = findViewById(R.id.hostname); @@ -789,12 +779,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) { processFingerprintVerification(pendingUri, false); @@ -909,11 +899,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()); @@ -927,15 +917,15 @@ 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); this.mPasswordLayout.setPasswordVisibilityToggleEnabled(editable); if (!mInitMode) { this.mAvatar.setVisibility(View.VISIBLE); this.mAvatar.setImageBitmap(avatarService().get(this.mAccount, getPixel(Config.AVATAR_SIZE))); - this.mAccountJid.setEnabled(false); + this.binding.accountJid.setEnabled(false); } else { this.mAvatar.setVisibility(View.GONE); } @@ -948,7 +938,7 @@ 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); @@ -1012,18 +1002,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); @@ -1042,20 +1022,13 @@ 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) { - - if (copyTextToClipboard(CryptoHelper.prettifyFingerprint(otrFingerprint), R.string.otr_fingerprint)) { - Toast.makeText( - EditAccountActivity.this, - R.string.toast_message_otr_fingerprint, - Toast.LENGTH_SHORT).show(); - } + 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 { @@ -1072,16 +1045,8 @@ 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); } @@ -1095,7 +1060,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } } 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); @@ -1103,7 +1068,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; @@ -1125,7 +1090,8 @@ 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); } } @@ -1153,53 +1119,44 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat 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) { - mAccount.setPgpSignId(0); - mAccount.unsetPgpSignature(); - xmppConnectionService.databaseBackend.updateAccount(mAccount); - xmppConnectionService.sendPresence(mAccount); - refreshUiReal(); - } + 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) { - Intent intent = new Intent(Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS); - 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(); - } + this.mDisableOsOptimizationsButton.setOnClickListener(v -> { + Intent intent = new Intent(Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS); + 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) { - Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS); - 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(); - } + this.mDisableOsOptimizationsButton.setOnClickListener(v -> { + Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS); + 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(); } }); } @@ -1212,12 +1169,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(); } @@ -1245,58 +1197,46 @@ 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()) { - mCaptchaDialog.dismiss(); - } - final AlertDialog.Builder builder = new AlertDialog.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); - imageView.setImageBitmap(captcha); - - builder.setTitle(getString(R.string.captcha_required)); - builder.setView(view); - - builder.setPositiveButton(getString(R.string.ok), - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String rc = input.getText().toString(); - data.put("username", account.getUsername()); - data.put("password", account.getPassword()); - data.put("ocr", rc); - data.submit(); - - if (xmppConnectionServiceBound) { - xmppConnectionService.sendCreateAccountWithCaptchaPacket( - account, id, data); - } - } - }); - builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (xmppConnectionService != null) { - xmppConnectionService.sendCreateAccountWithCaptchaPacket(account, null, null); + runOnUiThread(() -> { + if ((mCaptchaDialog != null) && mCaptchaDialog.isShowing()) { + mCaptchaDialog.dismiss(); + } + final AlertDialog.Builder builder = new AlertDialog.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); + imageView.setImageBitmap(captcha); + + builder.setTitle(getString(R.string.captcha_required)); + builder.setView(view); + + builder.setPositiveButton(getString(R.string.ok), + (dialog, which) -> { + String rc = input.getText().toString(); + data.put("username", account.getUsername()); + data.put("password", account.getPassword()); + data.put("ocr", rc); + data.submit(); + + if (xmppConnectionServiceBound) { + xmppConnectionService.sendCreateAccountWithCaptchaPacket( + account, id, data); } - } - }); + }); + 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) { - if (xmppConnectionService != null) { - xmppConnectionService.sendCreateAccountWithCaptchaPacket(account, null, null); - } - } - }); - mCaptchaDialog = builder.create(); - mCaptchaDialog.show(); - input.requestFocus(); - } + builder.setOnCancelListener(dialog -> { + if (xmppConnectionService != null) { + xmppConnectionService.sendCreateAccountWithCaptchaPacket(account, null, null); + } + }); + mCaptchaDialog = builder.create(); + mCaptchaDialog.show(); + input.requestFocus(); }); } @@ -1311,46 +1251,32 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat @Override public void onPreferencesFetched(final Element prefs) { - runOnUiThread(new Runnable() { - @Override - public void run() { - if (mFetchingMamPrefsToast != null) { - mFetchingMamPrefsToast.cancel(); - } - 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); - } - }); - 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())); - xmppConnectionService.pushMamPreferences(mAccount, prefs); - } - }); - builder.create().show(); + runOnUiThread(() -> { + if (mFetchingMamPrefsToast != null) { + mFetchingMamPrefsToast.cancel(); } + 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(), (dialog, which) -> choice.set(which)); + builder.setNegativeButton(R.string.cancel, null); + 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() { - if (mFetchingMamPrefsToast != null) { - mFetchingMamPrefsToast.cancel(); - } - Toast.makeText(EditAccountActivity.this, R.string.unable_to_fetch_mam_prefs, Toast.LENGTH_LONG).show(); + runOnUiThread(() -> { + if (mFetchingMamPrefsToast != null) { + mFetchingMamPrefsToast.cancel(); } + Toast.makeText(EditAccountActivity.this, R.string.unable_to_fetch_mam_prefs, Toast.LENGTH_LONG).show(); }); } diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 339f2c989..941f584c8 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -1,729 +1,731 @@ <?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" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/grey200"> + xmlns:tools="http://schemas.android.com/tools"> - <ScrollView - android:layout_width="fill_parent" + <RelativeLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_above="@+id/button_bar" - android:layout_alignParentTop="true"> + android:background="?attr/color_background_secondary"> - <LinearLayout - android:id="@+id/account_main_layout" - android:layout_width="match_parent" + <ScrollView + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_above="@+id/button_bar" + android:layout_alignParentTop="true"> - <RelativeLayout - android:id="@+id/editor" - android:layout_width="fill_parent" + <LinearLayout + android:id="@+id/account_main_layout" + android:layout_width="match_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="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding"> - - <com.makeramen.roundedimageview.RoundedImageView - android:id="@+id/avater" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_marginBottom="16dp" - android:adjustViewBounds="true" - android:background="@drawable/message_border" - android:contentDescription="@string/account_image_description" - android:maxHeight="384dp" - android:maxWidth="384dp" - android:padding="1dp" - app:riv_corner_radius="5dp" /> + android:orientation="vertical"> - <LinearLayout + <RelativeLayout + android:id="@+id/editor" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_below="@+id/avater" - android:orientation="vertical"> - - <android.support.design.widget.TextInputLayout - android:id="@+id/account_jid_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/account_settings_jabber_id"> - - <AutoCompleteTextView - android:id="@+id/account_jid" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:inputType="textEmailAddress" - android:textColor="?attr/color_text_primary" - android:textColorHint="?attr/color_text_secondary" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> + 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="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding"> - <android.support.design.widget.TextInputLayout - android:id="@+id/account_password_layout" - android:layout_width="match_parent" + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/avater" + android:layout_width="wrap_content" android:layout_height="wrap_content" - app:passwordToggleDrawable="@drawable/visibility_toggle_drawable" - app:passwordToggleEnabled="true" - app:passwordToggleTint="?attr/color_text_secondary"> - - <android.support.design.widget.TextInputEditText - android:id="@+id/account_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_marginBottom="16dp" + android:adjustViewBounds="true" + android:background="@drawable/message_border" + android:contentDescription="@string/account_image_description" + android:maxHeight="384dp" + android:maxWidth="384dp" + android:padding="1dp" + app:riv_corner_radius="5dp" /> <LinearLayout - android:id="@+id/name_port" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:orientation="horizontal" - android:weightSum="1"> + android:layout_below="@+id/avater" + android:orientation="vertical"> - <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.8" - android:orientation="vertical"> + <android.support.design.widget.TextInputLayout + android:id="@+id/account_jid_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/account_settings_jabber_id"> - <android.support.design.widget.TextInputLayout - android:id="@+id/hostname_layout" + <AutoCompleteTextView + android:id="@+id/account_jid" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/account_settings_hostname"> + android:imeOptions="actionNext" + android:inputType="textEmailAddress" + android:textColor="?attr/color_text_primary" + android:textColorHint="?attr/color_text_secondary" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> + + <android.support.design.widget.TextInputLayout + android:id="@+id/account_password_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:passwordToggleDrawable="@drawable/visibility_toggle_drawable" + app:passwordToggleEnabled="true" + app:passwordToggleTint="?attr/color_text_secondary"> - <EditText - android:id="@+id/hostname" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textNoSuggestions" - android:textColor="?attr/color_text_primary" - android:textColorHint="?attr/color_text_secondary" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> - </LinearLayout> + <android.support.design.widget.TextInputEditText + android:id="@+id/account_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.2" - android:orientation="vertical"> + android:id="@+id/name_port" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:orientation="horizontal" + android:weightSum="1"> - <android.support.design.widget.TextInputLayout - android:id="@+id/port_layout" - android:layout_width="match_parent" + <LinearLayout + android:layout_width="0dp" android:layout_height="match_parent" - android:hint="@string/account_settings_port"> + android:layout_weight="0.8" + android:orientation="vertical"> - <EditText - android:id="@+id/port" + <android.support.design.widget.TextInputLayout + android:id="@+id/hostname_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/account_settings_hostname"> + + <EditText + android:id="@+id/hostname" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textNoSuggestions" + android:textColor="?attr/color_text_primary" + android:textColorHint="?attr/color_text_secondary" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.2" + android:orientation="vertical"> + + <android.support.design.widget.TextInputLayout + android:id="@+id/port_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:inputType="number" - android:maxLength="5" - android:textColor="?attr/color_text_primary" - android:textColorHint="?attr/color_text_secondary" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> + android:hint="@string/account_settings_port"> + + <EditText + android:id="@+id/port" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:inputType="number" + android:maxLength="5" + android:textColor="?attr/color_text_primary" + android:textColorHint="?attr/color_text_secondary" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> + </LinearLayout> </LinearLayout> - </LinearLayout> - - <CheckBox - android:id="@+id/account_register_new" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/register_account" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - - <TextView - android:id="@+id/account_confirm_password_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/account_settings_confirm_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:visibility="gone" /> - - <EditText - android:id="@+id/account_password_confirm" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:hint="@string/confirm_password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody" - android:visibility="gone" /> - </LinearLayout> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/os_optimization" - 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="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:visibility="gone"> - - <TextView - android:id="@+id/os_optimization_headline" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/battery_optimizations_enabled" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> - - <TextView - android:id="@+id/os_optimization_body" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/os_optimization_headline" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" - android:text="@string/battery_optimizations_enabled_explained" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - - <Button - android:id="@+id/os_optimization_disable" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/os_optimization_body" - android:layout_marginRight="-8dp" - android:text="@string/disable" - android:textColor="@color/accent" /> - </RelativeLayout> - - <LinearLayout - android:id="@+id/stats" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - 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="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:visibility="gone"> - - <TableLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:shrinkColumns="0" - android:stretchColumns="1"> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content" - tools:ignore="UselessParent"> - <TextView + <CheckBox + android:id="@+id/account_register_new" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_session_established" + android:layout_marginTop="8dp" + android:text="@string/register_account" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> <TextView - android:id="@+id/session_est" + android:id="@+id/account_confirm_password_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" + android:text="@string/account_settings_confirm_password" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> - - </TableLayout> - - <TableLayout - android:id="@+id/server_info_more" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:shrinkColumns="0" - android:stretchColumns="1" - android:visibility="gone"> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_pep" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:visibility="gone" /> - <TextView - android:id="@+id/server_info_pep" - android:layout_width="wrap_content" + <EditText + android:id="@+id/account_password_confirm" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" + android:layout_marginTop="8dp" + android:hint="@string/confirm_password" + android:inputType="textPassword" android:textColor="@color/black87" + android:textColorHint="@color/black54" android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_blocking" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:visibility="gone" /> + </LinearLayout> + </RelativeLayout> - <TextView - android:id="@+id/server_info_blocking" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + <RelativeLayout + android:id="@+id/os_optimization" + 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="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:visibility="gone"> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TextView + android:id="@+id/os_optimization_headline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/battery_optimizations_enabled" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_stream_management" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TextView + android:id="@+id/os_optimization_body" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/os_optimization_headline" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:text="@string/battery_optimizations_enabled_explained" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TextView - android:id="@+id/server_info_sm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + <Button + android:id="@+id/os_optimization_disable" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_below="@+id/os_optimization_body" + android:layout_marginRight="-8dp" + android:text="@string/disable" + android:textColor="@color/accent" /> + </RelativeLayout> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <LinearLayout + android:id="@+id/stats" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + 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="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:visibility="gone"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_roster_version" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="0" + android:stretchColumns="1"> - <TextView - android:id="@+id/server_info_roster_version" - android:layout_width="wrap_content" + <TableRow + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + tools:ignore="UselessParent"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_carbon_messages" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_session_established" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/session_est" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> - <TextView - android:id="@+id/server_info_carbons" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + </TableLayout> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TableLayout + android:id="@+id/server_info_more" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="0" + android:stretchColumns="1" + android:visibility="gone"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_mam" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> - <TextView - android:id="@+id/server_info_mam" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_pep" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_pep" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_blocking" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_blocking" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_stream_management" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_sm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_roster_version" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_roster_version" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_carbon_messages" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_carbons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_mam" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_mam" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_csi" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_csi" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:id="@+id/push_row" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_push" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_push" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_http_upload" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_http_upload" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + </TableRow> + </TableLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_csi" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <RelativeLayout + android:id="@+id/pgp_fingerprint_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginTop="32dp"> - <TextView - android:id="@+id/server_info_csi" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/action_delete_pgp" + android:orientation="vertical"> - <TableRow - android:id="@+id/push_row" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TextView + android:id="@+id/pgp_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="monospace" + android:textColor="@color/primary" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + + <TextView + android:id="@+id/pgp_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/openpgp_key_id" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + </LinearLayout> - <TextView + <ImageButton + android:id="@+id/action_delete_pgp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_push" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:alpha="1.0" + android:background="?attr/selectableItemBackgroundBorderless" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_remove" + android:visibility="visible" /> + </RelativeLayout> - <TextView - android:id="@+id/server_info_push" + <RelativeLayout + android:id="@+id/otr_fingerprint_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginTop="24dp"> + + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - </TableRow> + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/action_copy_to_clipboard" + android:orientation="vertical"> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TextView + android:id="@+id/otr_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="monospace" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + + <TextView + android:id="@+id/otr_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/otr_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_http_upload" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + </LinearLayout> - <TextView - android:id="@+id/server_info_http_upload" + <ImageButton + android:id="@+id/action_copy_to_clipboard" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - - </TableRow> - </TableLayout> - - <RelativeLayout - android:id="@+id/pgp_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="32dp"> + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_otr_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + </RelativeLayout> - <LinearLayout + <RelativeLayout + android:id="@+id/axolotl_fingerprint_box" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/action_delete_pgp" - android:orientation="vertical"> - - <TextView - android:id="@+id/pgp_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="monospace" - android:textColor="@color/primary" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> + android:layout_height="match_parent" + android:layout_marginTop="24dp"> - <TextView - android:id="@+id/pgp_fingerprint_desc" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/openpgp_key_id" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo" /> - </LinearLayout> - - <ImageButton - android:id="@+id/action_delete_pgp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:alpha="1.0" - android:background="?attr/selectableItemBackgroundBorderless" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_remove" - android:visibility="visible" /> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/otr_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="24dp"> + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/axolotl_actions" + android:orientation="vertical"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/action_copy_to_clipboard" - android:orientation="vertical"> + <TextView + android:id="@+id/axolotl_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="monospace" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + + <TextView + android:id="@+id/own_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/omemo_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + </LinearLayout> - <TextView - android:id="@+id/otr_fingerprint" + <LinearLayout + android:id="@+id/axolotl_actions" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="monospace" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:orientation="vertical"> - <TextView - android:id="@+id/otr_fingerprint_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/otr_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo" /> + <ImageButton + android:id="@+id/action_copy_axolotl_to_clipboard" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_omemo_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + + <ImageButton + android:id="@+id/action_regenerate_omemo_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/regenerate_omemo_key" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_refresh" + android:visibility="gone" /> + </LinearLayout> + </RelativeLayout> + </LinearLayout> - </LinearLayout> + <LinearLayout + android:id="@+id/other_device_keys_card" + 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="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:visibility="gone"> - <ImageButton - android:id="@+id/action_copy_to_clipboard" + <TextView + android:id="@+id/other_device_keys_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_otr_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/axolotl_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="24dp"> + android:text="@string/other_devices" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> <LinearLayout - android:layout_width="wrap_content" + android:id="@+id/other_device_keys" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/axolotl_actions" - android:orientation="vertical"> + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:showDividers="middle"></LinearLayout> - <TextView - android:id="@+id/axolotl_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="monospace" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> - - <TextView - android:id="@+id/own_fingerprint_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/omemo_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/axolotl_actions" + <Button + android:id="@+id/clear_devices" + style="?android:attr/borderlessButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:orientation="vertical"> - - <ImageButton - android:id="@+id/action_copy_axolotl_to_clipboard" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_omemo_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> - - <ImageButton - android:id="@+id/action_regenerate_omemo_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/regenerate_omemo_key" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_refresh" - android:visibility="gone" /> - </LinearLayout> - </RelativeLayout> + android:layout_gravity="center_horizontal" + android:text="@string/clear_other_devices" + android:textColor="@color/accent" /> + </LinearLayout> </LinearLayout> + </ScrollView> - <LinearLayout - android:id="@+id/other_device_keys_card" - android:layout_width="fill_parent" + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_alignParentStart="true"> + + <Button + android:id="@+id/cancel_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" 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="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:visibility="gone"> - - <TextView - android:id="@+id/other_device_keys_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/other_devices" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> + android:layout_weight="1" + android:text="@string/cancel" + android:textColor="@color/black87" /> - <LinearLayout - android:id="@+id/other_device_keys" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:divider="?android:dividerHorizontal" - android:orientation="vertical" - android:showDividers="middle"></LinearLayout> - - <Button - android:id="@+id/clear_devices" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:text="@string/clear_other_devices" - android:textColor="@color/accent" /> - </LinearLayout> + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/black12" /> + + <Button + android:id="@+id/save_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:enabled="false" + android:text="@string/save" + android:textColor="@color/black54" /> </LinearLayout> - </ScrollView> - - <LinearLayout - android:id="@+id/button_bar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_alignParentStart="true"> - - <Button - android:id="@+id/cancel_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/cancel" - android:textColor="@color/black87" /> - - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/black12" /> - - <Button - android:id="@+id/save_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:enabled="false" - android:text="@string/save" - android:textColor="@color/black54" /> - </LinearLayout> - -</RelativeLayout>
\ No newline at end of file + </RelativeLayout> +</layout>
\ No newline at end of file |