sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return to welcome activity after deleting last account

This commit is contained in:
Daniel Gultsch 2018-02-10 10:45:33 +01:00
parent 97406ecf51
commit facc56bc7b
4 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1834,37 +1834,39 @@ public class XmppConnectionService extends Service {
}
public void createAccountFromKey(final String alias, final OnAccountCreated callback) {
new Thread(new Runnable() {
@Override
public void run() {
try {
X509Certificate[] chain = KeyChain.getCertificateChain(XmppConnectionService.this, alias);
Pair<Jid, String> info = CryptoHelper.extractJidAndName(chain[0]);
if (info == null) {
callback.informUser(R.string.certificate_does_not_contain_jid);
return;
}
if (findAccountByJid(info.first) == null) {
Account account = new Account(info.first, "");
account.setPrivateKeyAlias(alias);
account.setOption(Account.OPTION_DISABLED, true);
account.setDisplayName(info.second);
createAccount(account);
callback.onAccountCreated(account);
if (Config.X509_VERIFICATION) {
try {
getMemorizingTrustManager().getNonInteractive(account.getJid().getDomainpart()).checkClientTrusted(chain, "RSA");
} catch (CertificateException e) {
callback.informUser(R.string.certificate_chain_is_not_trusted);
}
}
} else {
callback.informUser(R.string.account_already_exists);
}
} catch (Exception e) {
e.printStackTrace();
new Thread(() -> {
try {
final X509Certificate[] chain = KeyChain.getCertificateChain(this, alias);
final X509Certificate cert = chain != null && chain.length > 0 ? chain[0] : null;
if (cert == null) {
callback.informUser(R.string.unable_to_parse_certificate);
return;
}
Pair<Jid, String> info = CryptoHelper.extractJidAndName(cert);
if (info == null) {
callback.informUser(R.string.certificate_does_not_contain_jid);
return;
}
if (findAccountByJid(info.first) == null) {
Account account = new Account(info.first, "");
account.setPrivateKeyAlias(alias);
account.setOption(Account.OPTION_DISABLED, true);
account.setDisplayName(info.second);
createAccount(account);
callback.onAccountCreated(account);
if (Config.X509_VERIFICATION) {
try {
getMemorizingTrustManager().getNonInteractive(account.getJid().getDomainpart()).checkClientTrusted(chain, "RSA");
} catch (CertificateException e) {
callback.informUser(R.string.certificate_chain_is_not_trusted);
}
}
} else {
callback.informUser(R.string.account_already_exists);
}
} catch (Exception e) {
e.printStackTrace();
callback.informUser(R.string.unable_to_parse_certificate);
}
}).start();
@ -1876,6 +1878,10 @@ public class XmppConnectionService extends Service {
X509Certificate[] chain = KeyChain.getCertificateChain(XmppConnectionService.this, alias);
Log.d(Config.LOGTAG, account.getJid().toBareJid() + " loaded certificate chain");
Pair<Jid, String> info = CryptoHelper.extractJidAndName(chain[0]);
if (info == null) {
showErrorToastInUi(R.string.certificate_does_not_contain_jid);
return;
}
if (account.getJid().toBareJid().equals(info.first)) {
account.setPrivateKeyAlias(alias);
account.setDisplayName(info.second);
@ -1942,19 +1948,11 @@ public class XmppConnectionService extends Service {
}
}
if (account.getXmppConnection() != null) {
new Thread(new Runnable() {
@Override
public void run() {
disconnect(account, true);
}
}).start();
new Thread(() -> disconnect(account, true)).start();
}
Runnable runnable = new Runnable() {
@Override
public void run() {
if (!databaseBackend.deleteAccount(account)) {
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": unable to delete account");
}
final Runnable runnable = () -> {
if (!databaseBackend.deleteAccount(account)) {
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": unable to delete account");
}
};
mDatabaseWriterExecutor.execute(runnable);

5
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -1248,10 +1248,7 @@ public class ConversationActivity extends XmppActivity
startActivity(redirectionIntent);
overridePendingTransition(0,0);
} else if (Config.MAGIC_CREATE_DOMAIN != null) {
Intent redirectionIntent =new Intent(this, WelcomeActivity.class);
redirectionIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(redirectionIntent);
overridePendingTransition(0,0);
WelcomeActivity.launch(this);
} else {
Intent editAccount = new Intent(this, EditAccountActivity.class);
editAccount.putExtra("init",true);

25
src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
View File

@ -353,17 +353,16 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
}
private void deleteAccount(final Account account) {
AlertDialog.Builder builder = new AlertDialog.Builder(
ManageAccountActivity.this);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.mgmt_account_are_you_sure));
builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setMessage(getString(R.string.mgmt_account_delete_confirm_text));
builder.setPositiveButton(getString(R.string.delete),
new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
xmppConnectionService.deleteAccount(account);
selectedAccount = null;
(dialog, which) -> {
xmppConnectionService.deleteAccount(account);
selectedAccount = null;
if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
WelcomeActivity.launch(this);
}
});
builder.setNegativeButton(getString(R.string.cancel), null);
@ -401,16 +400,14 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
@Override
public void onAccountCreated(Account account) {
switchToAccount(account, true);
Intent intent = new Intent(this, EditAccountActivity.class);
intent.putExtra("jid", account.getJid().toBareJid().toString());
intent.putExtra("init", true);
startActivity(intent);
}
@Override
public void informUser(final int r) {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(ManageAccountActivity.this, r, Toast.LENGTH_LONG).show();
}
});
runOnUiThread(() -> Toast.makeText(ManageAccountActivity.this, r, Toast.LENGTH_LONG).show());
}
}

8
src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
View File

@ -1,6 +1,7 @@
package eu.siacs.conversations.ui;
import android.app.ActionBar;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
@ -93,4 +94,11 @@ public class WelcomeActivity extends XmppActivity {
}
}
public static void launch(Activity activity) {
Intent intent = new Intent(activity, WelcomeActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
activity.startActivity(intent);
activity.overridePendingTransition(0,0);
}
}