narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

switch account activity to card view. started using data binder

Browse source
This commit is contained in:
Daniel Gultsch 2018-02-18 09:06:37 +01:00
parent 1c441a57e8
commit d0e58330e9
2 changed files with 840 additions and 899 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

403
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -5,6 +5,7 @@ import android.content.ActivityNotFoundException;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.databinding.DataBindingUtil;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@ -50,6 +51,7 @@ import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.crypto.axolotl.AxolotlService;
import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
import eu.siacs.conversations.databinding.ActivityEditAccountBinding;
import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.services.BarcodeProvider; import eu.siacs.conversations.services.BarcodeProvider;
import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.services.XmppConnectionService;
@ -74,7 +76,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched { OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched {
private static final int REQUEST_DATA_SAVER = 0x37af244; private static final int REQUEST_DATA_SAVER = 0x37af244;
private AutoCompleteTextView mAccountJid;
private TextInputLayout mAccountJidLayout; private TextInputLayout mAccountJidLayout;
private EditText mPassword; private EditText mPassword;
private TextInputLayout mPasswordLayout; private TextInputLayout mPasswordLayout;
@ -82,12 +83,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
private Button mCancelButton; private Button mCancelButton;
private Button mSaveButton; private Button mSaveButton;
private Button mDisableOsOptimizationsButton; private Button mDisableOsOptimizationsButton;
private TextView mDisableOsOptimizationsHeadline;
private TextView getmDisableOsOptimizationsBody; private TextView getmDisableOsOptimizationsBody;
private TableLayout mMoreTable; private TableLayout mMoreTable;
private LinearLayout mStats;
private RelativeLayout mOsOptimizations;
private TextView mServerInfoSm; private TextView mServerInfoSm;
private TextView mServerInfoRosterVersion; private TextView mServerInfoRosterVersion;
private TextView mServerInfoCarbons; private TextView mServerInfoCarbons;
@ -112,7 +110,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
private ImageButton mAxolotlFingerprintToClipboardButton; private ImageButton mAxolotlFingerprintToClipboardButton;
private ImageButton mPgpDeleteFingerprintButton; private ImageButton mPgpDeleteFingerprintButton;
private LinearLayout keys; private LinearLayout keys;
private LinearLayout keysCard;
private LinearLayout mNamePort; private LinearLayout mNamePort;
private EditText mHostname; private EditText mHostname;
private TextInputLayout mHostnameLayout; private TextInputLayout mHostnameLayout;
@ -146,15 +143,15 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED && !accountInfoEdited()) { if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED && !accountInfoEdited()) {
mAccount.setOption(Account.OPTION_DISABLED, false); mAccount.setOption(Account.OPTION_DISABLED, false);
if (!xmppConnectionService.updateAccount(mAccount)) { 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; return;
} }
final boolean registerNewAccount = mRegisterNew.isChecked() && !Config.DISALLOW_REGISTRATION_IN_UI; 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)); mAccountJidLayout.setError(getString(R.string.invalid_username));
removeErrorsOnAllBut(mAccountJidLayout); removeErrorsOnAllBut(mAccountJidLayout);
mAccountJid.requestFocus(); binding.accountJid.requestFocus();
return; return;
} }
@ -168,7 +165,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url.toString()))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url.toString())));
return; return;
} catch (ActivityNotFoundException e) { } 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; return;
} }
} }
@ -176,9 +173,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
final Jid jid; final Jid jid;
try { try {
if (mUsernameMode) { if (mUsernameMode) {
jid = Jid.fromParts(mAccountJid.getText().toString(), getUserModeDomain(), null); jid = Jid.fromParts(binding.accountJid.getText().toString(), getUserModeDomain(), null);
} else { } else {
jid = Jid.fromString(mAccountJid.getText().toString()); jid = Jid.fromString(binding.accountJid.getText().toString());
} }
} catch (final InvalidJidException e) { } catch (final InvalidJidException e) {
if (mUsernameMode) { if (mUsernameMode) {
@ -186,15 +183,15 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} else { } else {
mAccountJidLayout.setError(getString(R.string.invalid_jid)); mAccountJidLayout.setError(getString(R.string.invalid_jid));
} }
mAccountJid.requestFocus(); binding.accountJid.requestFocus();
removeErrorsOnAllBut(mAccountJidLayout); removeErrorsOnAllBut(mAccountJidLayout);
return; return;
} }
String hostname = null; String hostname = null;
int numericPort = 5222; int numericPort = 5222;
if (mShowOptions) { if (mShowOptions) {
hostname = mHostname.getText().toString().replaceAll("\\s",""); hostname = mHostname.getText().toString().replaceAll("\\s", "");
final String port = mPort.getText().toString().replaceAll("\\s",""); final String port = mPort.getText().toString().replaceAll("\\s", "");
if (hostname.contains(" ")) { if (hostname.contains(" ")) {
mHostnameLayout.setError(getString(R.string.not_valid_hostname)); mHostnameLayout.setError(getString(R.string.not_valid_hostname));
mHostname.requestFocus(); mHostname.requestFocus();
@ -225,7 +222,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
mAccountJidLayout.setError(getString(R.string.invalid_jid)); mAccountJidLayout.setError(getString(R.string.invalid_jid));
} }
removeErrorsOnAllBut(mAccountJidLayout); removeErrorsOnAllBut(mAccountJidLayout);
mAccountJid.requestFocus(); binding.accountJid.requestFocus();
return; return;
} }
if (mAccount != null) { if (mAccount != null) {
@ -239,14 +236,14 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
mAccount.setPassword(password); mAccount.setPassword(password);
mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount); mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
if (!xmppConnectionService.updateAccount(mAccount)) { 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; return;
} }
} else { } else {
if (xmppConnectionService.findAccountByJid(jid) != null) { if (xmppConnectionService.findAccountByJid(jid) != null) {
mAccountJidLayout.setError(getString(R.string.account_already_exists)); mAccountJidLayout.setError(getString(R.string.account_already_exists));
removeErrorsOnAllBut(mAccountJidLayout); removeErrorsOnAllBut(mAccountJidLayout);
mAccountJid.requestFocus(); binding.accountJid.requestFocus();
return; return;
} }
mAccount = new Account(jid.toBareJid(), password); mAccount = new Account(jid.toBareJid(), password);
@ -284,9 +281,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
private boolean mSavedInstanceInit = false; private boolean mSavedInstanceInit = false;
private Button mClearDevicesButton; private Button mClearDevicesButton;
private XmppUri pendingUri = null; private XmppUri pendingUri = null;
private boolean mUseTor; private boolean mUseTor;
private ActivityEditAccountBinding binding;
public void refreshUiReal() { public void refreshUiReal() {
invalidateOptionsMenu(); invalidateOptionsMenu();
if (mAccount != null if (mAccount != null
&& mAccount.getStatus() != Account.State.ONLINE && mAccount.getStatus() != Account.State.ONLINE
@ -369,25 +367,25 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} }
}; };
private View.OnFocusChangeListener mEditTextFocusListener = new View.OnFocusChangeListener() { private View.OnFocusChangeListener mEditTextFocusListener = new View.OnFocusChangeListener() {
@Override @Override
public void onFocusChange(View view, boolean b) { public void onFocusChange(View view, boolean b) {
EditText et = (EditText) view; EditText et = (EditText) view;
if (b) { if (b) {
int resId = mUsernameMode ? R.string.username : R.string.account_settings_example_jabber_id; int resId = mUsernameMode ? R.string.username : R.string.account_settings_example_jabber_id;
if (view.getId() == R.id.hostname) { if (view.getId() == R.id.hostname) {
resId = mUseTor ? R.string.hostname_or_onion : R.string.hostname_example; resId = mUseTor ? R.string.hostname_or_onion : R.string.hostname_example;
} }
final int res = resId; final int res = resId;
new Handler().postDelayed(() -> et.setHint(res),200); new Handler().postDelayed(() -> et.setHint(res), 200);
} else { } else {
et.setHint(null); et.setHint(null);
} }
} }
}; };
private final OnClickListener mAvatarClickListener = new OnClickListener() { private final OnClickListener mAvatarClickListener = new OnClickListener() {
@Override @Override
public void onClick(final View view) { public void onClick(final View view) {
if (mAccount != null) { if (mAccount != null) {
@ -433,17 +431,17 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
@Override @Override
protected void processFingerprintVerification(XmppUri uri) { protected void processFingerprintVerification(XmppUri uri) {
processFingerprintVerification(uri,true); processFingerprintVerification(uri, true);
} }
protected void processFingerprintVerification(XmppUri uri, boolean showWarningToast) { protected void processFingerprintVerification(XmppUri uri, boolean showWarningToast) {
if (mAccount != null && mAccount.getJid().toBareJid().equals(uri.getJid()) && uri.hasFingerprints()) { if (mAccount != null && mAccount.getJid().toBareJid().equals(uri.getJid()) && uri.hasFingerprints()) {
if (xmppConnectionService.verifyFingerprints(mAccount,uri.getFingerprints())) { if (xmppConnectionService.verifyFingerprints(mAccount, uri.getFingerprints())) {
Toast.makeText(this,R.string.verified_fingerprints,Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.verified_fingerprints, Toast.LENGTH_SHORT).show();
} }
} else if (showWarningToast) { } 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.setEnabled(true);
this.mSaveButton.setTextColor(getPrimaryTextColor()); this.mSaveButton.setTextColor(getPrimaryTextColor());
} else if (mAccount != null } 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.setEnabled(false);
this.mSaveButton.setTextColor(getSecondaryTextColor()); this.mSaveButton.setTextColor(getSecondaryTextColor());
this.mSaveButton.setText(R.string.account_status_connecting); this.mSaveButton.setText(R.string.account_status_connecting);
@ -479,7 +477,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} }
} else { } else {
XmppConnection connection = mAccount == null ? null : mAccount.getXmppConnection(); XmppConnection connection = mAccount == null ? null : mAccount.getXmppConnection();
URL url = connection != null && mAccount.getStatus() == Account.State.PAYMENT_REQUIRED ? connection.getRedirectionUrl() : null; URL url = connection != null && mAccount.getStatus() == Account.State.PAYMENT_REQUIRED ? connection.getRedirectionUrl() : null;
if (url != null) { if (url != null) {
this.mSaveButton.setText(R.string.open_website); this.mSaveButton.setText(R.string.open_website);
} else { } else {
@ -488,7 +486,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} }
} else { } else {
XmppConnection connection = mAccount == null ? null : mAccount.getXmppConnection(); XmppConnection connection = mAccount == null ? null : mAccount.getXmppConnection();
URL url = connection != null && mAccount.getStatus() == Account.State.REGISTRATION_WEB ? connection.getRedirectionUrl() : null; URL url = connection != null && mAccount.getStatus() == Account.State.REGISTRATION_WEB ? connection.getRedirectionUrl() : null;
if (url != null && mRegisterNew.isChecked()) { if (url != null && mRegisterNew.isChecked()) {
this.mSaveButton.setText(R.string.open_website); this.mSaveButton.setText(R.string.open_website);
} else { } else {
@ -515,7 +513,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} else { } else {
unmodified = this.mAccount.getJid().toBareJid().toString(); unmodified = this.mAccount.getJid().toBareJid().toString();
} }
return !unmodified.equals(this.mAccountJid.getText().toString()); return !unmodified.equals(this.binding.accountJid.getText().toString());
} }
protected boolean passwordChangedInMagicCreateMode() { protected boolean passwordChangedInMagicCreateMode() {
@ -542,10 +540,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
this.mSavedInstanceAccount = savedInstanceState.getString("account"); this.mSavedInstanceAccount = savedInstanceState.getString("account");
this.mSavedInstanceInit = savedInstanceState.getBoolean("initMode", false); this.mSavedInstanceInit = savedInstanceState.getBoolean("initMode", false);
} }
setContentView(R.layout.activity_edit_account); this.binding = DataBindingUtil.setContentView(this, R.layout.activity_edit_account);
this.mAccountJid = (AutoCompleteTextView) findViewById(R.id.account_jid); binding.accountJid.addTextChangedListener(this.mTextWatcher);
this.mAccountJid.addTextChangedListener(this.mTextWatcher); binding.accountJid.setOnFocusChangeListener(this.mEditTextFocusListener);
this.mAccountJid.setOnFocusChangeListener(this.mEditTextFocusListener);
this.mAccountJidLayout = (TextInputLayout) findViewById(R.id.account_jid_layout); this.mAccountJidLayout = (TextInputLayout) findViewById(R.id.account_jid_layout);
this.mPassword = (EditText) findViewById(R.id.account_password); this.mPassword = (EditText) findViewById(R.id.account_password);
this.mPassword.addTextChangedListener(this.mTextWatcher); 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 = (ImageView) findViewById(R.id.avater);
this.mAvatar.setOnClickListener(this.mAvatarClickListener); this.mAvatar.setOnClickListener(this.mAvatarClickListener);
this.mRegisterNew = (CheckBox) findViewById(R.id.account_register_new); 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.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.getmDisableOsOptimizationsBody = (TextView) findViewById(R.id.os_optimization_body);
this.mSessionEst = (TextView) findViewById(R.id.session_est); this.mSessionEst = (TextView) findViewById(R.id.session_est);
this.mServerInfoRosterVersion = (TextView) findViewById(R.id.server_info_roster_version); 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.mAxolotlFingerprintBox = (RelativeLayout) findViewById(R.id.axolotl_fingerprint_box);
this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_axolotl_to_clipboard); this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_axolotl_to_clipboard);
this.mOwnFingerprintDesc = (TextView) findViewById(R.id.own_fingerprint_desc); 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.keys = (LinearLayout) findViewById(R.id.other_device_keys);
this.mNamePort = (LinearLayout) findViewById(R.id.name_port); this.mNamePort = (LinearLayout) findViewById(R.id.name_port);
this.mHostname = (EditText) findViewById(R.id.hostname); this.mHostname = (EditText) findViewById(R.id.hostname);
this.mHostname.addTextChangedListener(mTextWatcher); this.mHostname.addTextChangedListener(mTextWatcher);
this.mHostname.setOnFocusChangeListener(mEditTextFocusListener); 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 = (Button) findViewById(R.id.clear_devices);
this.mClearDevicesButton.setOnClickListener(new OnClickListener() { this.mClearDevicesButton.setOnClickListener(new OnClickListener() {
@Override @Override
@ -598,7 +591,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
this.mPort = (EditText) findViewById(R.id.port); this.mPort = (EditText) findViewById(R.id.port);
this.mPort.setText("5222"); this.mPort.setText("5222");
this.mPort.addTextChangedListener(mTextWatcher); 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.mSaveButton = (Button) findViewById(R.id.save_button);
this.mCancelButton = (Button) findViewById(R.id.cancel_button); this.mCancelButton = (Button) findViewById(R.id.cancel_button);
this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener); this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
@ -704,7 +697,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} }
} }
SharedPreferences preferences = getPreferences(); SharedPreferences preferences = getPreferences();
mUseTor = Config.FORCE_ORBOT || preferences.getBoolean("use_tor", false); mUseTor = Config.FORCE_ORBOT || preferences.getBoolean("use_tor", false);
this.mShowOptions = mUseTor || preferences.getBoolean("show_connection_options", false); this.mShowOptions = mUseTor || preferences.getBoolean("show_connection_options", false);
this.mNamePort.setVisibility(mShowOptions ? View.VISIBLE : View.GONE); this.mNamePort.setVisibility(mShowOptions ? View.VISIBLE : View.GONE);
} }
@ -768,12 +761,12 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
this.mCancelButton.setTextColor(getSecondaryTextColor()); this.mCancelButton.setTextColor(getSecondaryTextColor());
} }
if (mUsernameMode) { if (mUsernameMode) {
this.mAccountJid.setHint(R.string.username_hint); this.binding.accountJid.setHint(R.string.username_hint);
} else { } else {
final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this, final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
R.layout.simple_list_item, R.layout.simple_list_item,
xmppConnectionService.getKnownHosts()); xmppConnectionService.getKnownHosts());
this.mAccountJid.setAdapter(mKnownHostsAdapter); this.binding.accountJid.setAdapter(mKnownHostsAdapter);
} }
if (pendingUri != null) { if (pendingUri != null) {
@ -831,7 +824,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
private void shareBarcode() { private void shareBarcode() {
Intent intent = new Intent(Intent.ACTION_SEND); 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.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
intent.setType("image/png"); intent.setType("image/png");
startActivity(Intent.createChooser(intent, getText(R.string.share_with))); startActivity(Intent.createChooser(intent, getText(R.string.share_with)));
@ -856,7 +849,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
private void changePresence() { private void changePresence() {
Intent intent = new Intent(this, SetPresenceActivity.class); 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); startActivity(intent);
} }
@ -869,11 +862,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
private void updateAccountInformation(boolean init) { private void updateAccountInformation(boolean init) {
if (init) { if (init) {
this.mAccountJid.getEditableText().clear(); this.binding.accountJid.getEditableText().clear();
if (mUsernameMode) { if (mUsernameMode) {
this.mAccountJid.getEditableText().append(this.mAccount.getJid().getLocalpart()); this.binding.accountJid.getEditableText().append(this.mAccount.getJid().getLocalpart());
} else { } 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().clear();
this.mPassword.getEditableText().append(this.mAccount.getPassword()); 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); final boolean editable = !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY);
this.mAccountJid.setEnabled(editable); this.binding.accountJid.setEnabled(editable);
this.mAccountJid.setFocusable(editable); this.binding.accountJid.setFocusable(editable);
this.mAccountJid.setFocusableInTouchMode(editable); this.binding.accountJid.setFocusableInTouchMode(editable);
if (editable) { if (editable) {
this.mPassword.setCustomSelectionActionModeCallback(null); this.mPassword.setCustomSelectionActionModeCallback(null);
} else { } else {
@ -910,10 +903,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} }
if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) { if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
Features features = this.mAccount.getXmppConnection().getFeatures(); 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 showBatteryWarning = !xmppConnectionService.getPushManagementService().available(mAccount) && isOptimizingBattery();
boolean showDataSaverWarning = isAffectedByDataSaver(); boolean showDataSaverWarning = isAffectedByDataSaver();
showOsOptimizationWarning(showBatteryWarning,showDataSaverWarning); showOsOptimizationWarning(showBatteryWarning, showDataSaverWarning);
this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection() this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()
.getLastSessionEstablished())); .getLastSessionEstablished()));
if (features.rosterVersioning()) { if (features.rosterVersioning()) {
@ -974,18 +967,8 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} }
final long pgpKeyId = this.mAccount.getPgpId(); final long pgpKeyId = this.mAccount.getPgpId();
if (pgpKeyId != 0 && Config.supportOpenPgp()) { if (pgpKeyId != 0 && Config.supportOpenPgp()) {
OnClickListener openPgp = new OnClickListener() { OnClickListener openPgp = view -> launchOpenKeyChain(pgpKeyId);
@Override OnClickListener delete = view -> showDeletePgpDialog();
public void onClick(View view) {
launchOpenKeyChain(pgpKeyId);
}
};
OnClickListener delete = new OnClickListener() {
@Override
public void onClick(View view) {
showDeletePgpDialog();
}
};
this.mPgpFingerprintBox.setVisibility(View.VISIBLE); this.mPgpFingerprintBox.setVisibility(View.VISIBLE);
this.mPgpFingerprint.setText(OpenPgpUtils.convertKeyIdToHex(pgpKeyId)); this.mPgpFingerprint.setText(OpenPgpUtils.convertKeyIdToHex(pgpKeyId));
this.mPgpFingerprint.setOnClickListener(openPgp); this.mPgpFingerprint.setOnClickListener(openPgp);
@ -1004,22 +987,15 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} }
this.mOtrFingerprintBox.setVisibility(View.VISIBLE); this.mOtrFingerprintBox.setVisibility(View.VISIBLE);
this.mOtrFingerprint.setText(CryptoHelper.prettifyFingerprint(otrFingerprint)); this.mOtrFingerprint.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
this.mOtrFingerprintToClipboardButton this.mOtrFingerprintToClipboardButton.setVisibility(View.VISIBLE);
.setVisibility(View.VISIBLE); this.mOtrFingerprintToClipboardButton.setOnClickListener(v -> {
this.mOtrFingerprintToClipboardButton if (copyTextToClipboard(CryptoHelper.prettifyFingerprint(otrFingerprint), R.string.otr_fingerprint)) {
.setOnClickListener(new View.OnClickListener() { Toast.makeText(
EditAccountActivity.this,
@Override R.string.toast_message_otr_fingerprint,
public void onClick(final View v) { Toast.LENGTH_SHORT).show();
}
if (copyTextToClipboard(CryptoHelper.prettifyFingerprint(otrFingerprint), R.string.otr_fingerprint)) { });
Toast.makeText(
EditAccountActivity.this,
R.string.toast_message_otr_fingerprint,
Toast.LENGTH_SHORT).show();
}
}
});
} else { } else {
this.mOtrFingerprintBox.setVisibility(View.GONE); this.mOtrFingerprintBox.setVisibility(View.GONE);
} }
@ -1034,30 +1010,22 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
this.mOwnFingerprintDesc.setText(R.string.omemo_fingerprint); this.mOwnFingerprintDesc.setText(R.string.omemo_fingerprint);
} }
this.mAxolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2))); this.mAxolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2)));
this.mAxolotlFingerprintToClipboardButton this.mAxolotlFingerprintToClipboardButton.setVisibility(View.VISIBLE);
.setVisibility(View.VISIBLE); this.mAxolotlFingerprintToClipboardButton.setOnClickListener(v -> copyOmemoFingerprint(ownAxolotlFingerprint));
this.mAxolotlFingerprintToClipboardButton
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(final View v) {
copyOmemoFingerprint(ownAxolotlFingerprint);
}
});
} else { } else {
this.mAxolotlFingerprintBox.setVisibility(View.GONE); this.mAxolotlFingerprintBox.setVisibility(View.GONE);
} }
boolean hasKeys = false; boolean hasKeys = false;
keys.removeAllViews(); keys.removeAllViews();
for(XmppAxolotlSession session : mAccount.getAxolotlService().findOwnSessions()) { for (XmppAxolotlSession session : mAccount.getAxolotlService().findOwnSessions()) {
if (!session.getTrust().isCompromised()) { if (!session.getTrust().isCompromised()) {
boolean highlight = session.getFingerprint().equals(messageFingerprint); boolean highlight = session.getFingerprint().equals(messageFingerprint);
addFingerprintRow(keys,session,highlight); addFingerprintRow(keys, session, highlight);
hasKeys = true; hasKeys = true;
} }
} }
if (hasKeys && Config.supportOmemo()) { if (hasKeys && Config.supportOmemo()) {
keysCard.setVisibility(View.VISIBLE); this.binding.otherDeviceKeysCard.setVisibility(View.VISIBLE);
Set<Integer> otherDevices = mAccount.getAxolotlService().getOwnDeviceIds(); Set<Integer> otherDevices = mAccount.getAxolotlService().getOwnDeviceIds();
if (otherDevices == null || otherDevices.isEmpty()) { if (otherDevices == null || otherDevices.isEmpty()) {
mClearDevicesButton.setVisibility(View.GONE); mClearDevicesButton.setVisibility(View.GONE);
@ -1065,7 +1033,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
mClearDevicesButton.setVisibility(View.VISIBLE); mClearDevicesButton.setVisibility(View.VISIBLE);
} }
} else { } else {
keysCard.setVisibility(View.GONE); this.binding.otherDeviceKeysCard.setVisibility(View.GONE);
} }
} else { } else {
final TextInputLayout errorLayout; final TextInputLayout errorLayout;
@ -1087,12 +1055,13 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
errorLayout = null; errorLayout = null;
} }
removeErrorsOnAllBut(errorLayout); removeErrorsOnAllBut(errorLayout);
this.mStats.setVisibility(View.GONE); this.binding.stats.setVisibility(View.GONE);
this.binding.otherDeviceKeysCard.setVisibility(View.GONE);
} }
} }
private void removeErrorsOnAllBut(TextInputLayout exception) { private void removeErrorsOnAllBut(TextInputLayout exception) {
if (this.mAccountJidLayout != exception){ if (this.mAccountJidLayout != exception) {
this.mAccountJidLayout.setErrorEnabled(false); this.mAccountJidLayout.setErrorEnabled(false);
this.mAccountJidLayout.setError(null); this.mAccountJidLayout.setError(null);
} }
@ -1114,54 +1083,45 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.unpublish_pgp); builder.setTitle(R.string.unpublish_pgp);
builder.setMessage(R.string.unpublish_pgp_message); builder.setMessage(R.string.unpublish_pgp_message);
builder.setNegativeButton(R.string.cancel,null); builder.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.confirm, (dialogInterface, i) -> {
@Override mAccount.setPgpSignId(0);
public void onClick(DialogInterface dialogInterface, int i) { mAccount.unsetPgpSignature();
mAccount.setPgpSignId(0); xmppConnectionService.databaseBackend.updateAccount(mAccount);
mAccount.unsetPgpSignature(); xmppConnectionService.sendPresence(mAccount);
xmppConnectionService.databaseBackend.updateAccount(mAccount); refreshUiReal();
xmppConnectionService.sendPresence(mAccount);
refreshUiReal();
}
}); });
builder.create().show(); builder.create().show();
} }
private void showOsOptimizationWarning(boolean showBatteryWarning, boolean showDataSaverWarning) { 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) { 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.getmDisableOsOptimizationsBody.setText(R.string.data_saver_enabled_explained);
this.mDisableOsOptimizationsButton.setText(R.string.allow); this.mDisableOsOptimizationsButton.setText(R.string.allow);
this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() { this.mDisableOsOptimizationsButton.setOnClickListener(v -> {
@Override Intent intent = new Intent(Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS);
public void onClick(View v) { Uri uri = Uri.parse("package:" + getPackageName());
Intent intent = new Intent(Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS); intent.setData(uri);
Uri uri = Uri.parse("package:"+getPackageName()); try {
intent.setData(uri); startActivityForResult(intent, REQUEST_DATA_SAVER);
try { } catch (ActivityNotFoundException e) {
startActivityForResult(intent, REQUEST_DATA_SAVER); Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_data_saver, Toast.LENGTH_SHORT).show();
} catch (ActivityNotFoundException e) {
Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_data_saver, Toast.LENGTH_SHORT).show();
}
} }
}); });
} else if (showBatteryWarning) { } else if (showBatteryWarning) {
this.mDisableOsOptimizationsButton.setText(R.string.disable); 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.getmDisableOsOptimizationsBody.setText(R.string.battery_optimizations_enabled_explained);
this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() { this.mDisableOsOptimizationsButton.setOnClickListener(v -> {
@Override Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
public void onClick(View v) { Uri uri = Uri.parse("package:" + getPackageName());
Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS); intent.setData(uri);
Uri uri = Uri.parse("package:"+getPackageName()); try {
intent.setData(uri); startActivityForResult(intent, REQUEST_BATTERY_OP);
try { } catch (ActivityNotFoundException e) {
startActivityForResult(intent, REQUEST_BATTERY_OP); Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
} 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.setMessage(getString(R.string.clear_other_devices_desc));
builder.setNegativeButton(getString(R.string.cancel), null); builder.setNegativeButton(getString(R.string.cancel), null);
builder.setPositiveButton(getString(R.string.accept), builder.setPositiveButton(getString(R.string.accept),
new DialogInterface.OnClickListener() { (dialog, which) -> mAccount.getAxolotlService().wipeOtherPepDevices());
@Override
public void onClick(DialogInterface dialog, int which) {
mAccount.getAxolotlService().wipeOtherPepDevices();
}
});
builder.create().show(); builder.create().show();
} }
@ -1196,112 +1151,80 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
@Override @Override
public void onCaptchaRequested(final Account account, final String id, final Data data, final Bitmap captcha) { public void onCaptchaRequested(final Account account, final String id, final Data data, final Bitmap captcha) {
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override if (mCaptchaDialog != null && mCaptchaDialog.isShowing()) {
public void run() { mCaptchaDialog.dismiss();
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);
}
}
});
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();
} }
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);
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(dialog -> {
if (xmppConnectionService != null) {
xmppConnectionService.sendCreateAccountWithCaptchaPacket(account, null, null);
}
});
mCaptchaDialog = builder.create();
mCaptchaDialog.show();
input.requestFocus();
}); });
} }
public void onShowErrorToast(final int resId) { public void onShowErrorToast(final int resId) {
runOnUiThread(new Runnable() { runOnUiThread(() -> Toast.makeText(EditAccountActivity.this, resId, Toast.LENGTH_SHORT).show());
@Override
public void run() {
Toast.makeText(EditAccountActivity.this, resId, Toast.LENGTH_SHORT).show();
}
});
} }
@Override @Override
public void onPreferencesFetched(final Element prefs) { public void onPreferencesFetched(final Element prefs) {
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override if (mFetchingMamPrefsToast != null) {
public void run() { mFetchingMamPrefsToast.cancel();
if (mFetchingMamPrefsToast != null) {
mFetchingMamPrefsToast.cancel();
}
AlertDialog.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();
} }
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 @Override
public void onPreferencesFetchFailed() { public void onPreferencesFetchFailed() {
runOnUiThread(new Runnable() { runOnUiThread(() -> {
@Override if (mFetchingMamPrefsToast != null) {
public void run() { mFetchingMamPrefsToast.cancel();
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();
}); });
} }

1336
src/main/res/layout/activity_edit_account.xml
View file

File diff suppressed because it is too large Load diff