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

check if account is online before doing smp

Browse source
This commit is contained in:
iNPUTmice 2014-11-12 12:45:59 +01:00
parent 52ca2e7391
commit f1e2be4096
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
View file

@ -50,29 +50,33 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
private View.OnClickListener mCreateSharedSecretListener = new View.OnClickListener() { private View.OnClickListener mCreateSharedSecretListener = new View.OnClickListener() {
@Override @Override
public void onClick(final View view) { public void onClick(final View view) {
final String question = mSharedSecretHint.getText().toString(); if (isAccountOnline()) {
final String secret = mSharedSecretSecret.getText().toString(); final String question = mSharedSecretHint.getText().toString();
if (!initSmp(question,secret)) { final String secret = mSharedSecretSecret.getText().toString();
Toast.makeText(getApplicationContext(),"smp failed",Toast.LENGTH_SHORT).show(); initSmp(question, secret);
updateView();
} }
updateView();
} }
}; };
private View.OnClickListener mCancelSharedSecretListener = new View.OnClickListener() { private View.OnClickListener mCancelSharedSecretListener = new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
abortSmp(); if (isAccountOnline()) {
updateView(); abortSmp();
updateView();
}
} }
}; };
private View.OnClickListener mRespondSharedSecretListener = new View.OnClickListener() { private View.OnClickListener mRespondSharedSecretListener = new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
final String question = mSharedSecretHint.getText().toString(); if (isAccountOnline()) {
final String secret = mSharedSecretSecret.getText().toString(); final String question = mSharedSecretHint.getText().toString();
respondSmp(question,secret); final String secret = mSharedSecretSecret.getText().toString();
updateView(); respondSmp(question, secret);
updateView();
}
} }
}; };
private View.OnClickListener mRetrySharedSecretListener = new View.OnClickListener() { private View.OnClickListener mRetrySharedSecretListener = new View.OnClickListener() {
@ -138,6 +142,15 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
} }
} }
protected boolean isAccountOnline() {
if (this.mAccount.getStatus() != Account.STATUS_ONLINE) {
Toast.makeText(this,R.string.not_connected_try_again,Toast.LENGTH_SHORT).show();
return false;
} else {
return true;
}
}
protected boolean handleIntent(Intent intent) { protected boolean handleIntent(Intent intent) {
if (intent.getAction().equals(ACTION_VERIFY_CONTACT)) { if (intent.getAction().equals(ACTION_VERIFY_CONTACT)) {
try { try {