From 569b9f4e66bab9dc9481ca374289c07b9200bac7 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 20 Oct 2015 15:27:33 +0200 Subject: [PATCH] open manage account + certificate chooser when cbe mode is enabled --- src/main/AndroidManifest.xml | 123 +++++++++--------- .../ui/ConversationActivity.java | 43 +++--- .../ui/ManageAccountActivity.java | 24 +++- src/main/res/values/strings.xml | 1 + 4 files changed, 104 insertions(+), 87 deletions(-) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index ec2303564..117bce928 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -4,33 +4,35 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"> - - - - - - - - - - + + + + + + + + + + - + - + tools:replace="android:label"> + - + - - - - + + + + @@ -38,100 +40,102 @@ android:name=".ui.ConversationActivity" android:label="@string/app_name" android:launchMode="singleTask" - android:windowSoftInputMode="stateHidden" > + android:windowSoftInputMode="stateHidden"> - + - + + android:label="@string/title_activity_start_conversation" + android:launchMode="singleTask"> - + - + - - + + - + - - + + - + - + - + - + + android:label="@string/title_activity_settings"/> + android:label="@string/title_activity_choose_contact"/> - + android:label="@string/title_activity_block_list"/> + + android:label="@string/title_activity_manage_accounts" + android:launchMode="singleTask"/> + android:launchMode="singleTask" + android:windowSoftInputMode="stateHidden|adjustResize"/> + android:windowSoftInputMode="stateHidden"/> + android:windowSoftInputMode="stateHidden"/> + android:windowSoftInputMode="stateHidden"/> + android:windowSoftInputMode="stateHidden"/> + android:label="@string/app_name"> - + - + - + - + - + - + - + - + - + + android:parentActivityName=".ui.SettingsActivity"> + android:value="eu.siacs.conversations.ui.SettingsActivity"/> - + + diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 5831df56a..8bd512144 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -35,6 +35,7 @@ import net.java.otr4j.session.SessionStatus; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; import de.timroes.android.listview.EnhancedListView; import eu.siacs.conversations.Config; @@ -105,7 +106,7 @@ public class ConversationActivity extends XmppActivity private Toast prepareFileToast; private boolean mActivityPaused = false; - private boolean mRedirected = true; + private AtomicBoolean mRedirected = new AtomicBoolean(false); public Conversation getSelectedConversation() { return this.mSelectedConversation; @@ -631,6 +632,12 @@ public class ConversationActivity extends XmppActivity this.mConversationFragment.reInit(getSelectedConversation()); } else { setSelectedConversation(null); + if (mRedirected.compareAndSet(false,true)) { + Intent intent = new Intent(this, StartConversationActivity.class); + intent.putExtra("init",true); + startActivity(intent); + finish(); + } } } } @@ -985,7 +992,7 @@ public class ConversationActivity extends XmppActivity @Override public void onStart() { super.onStart(); - this.mRedirected = false; + this.mRedirected.set(false); if (this.xmppConnectionServiceBound) { this.onBackendConnected(); } @@ -1049,14 +1056,16 @@ public class ConversationActivity extends XmppActivity } if (xmppConnectionService.getAccounts().size() == 0) { - if (!mRedirected) { - this.mRedirected = true; - startActivity(new Intent(this, EditAccountActivity.class)); + if (mRedirected.compareAndSet(false,true)) { + if (Config.X509_VERIFICATION) { + startActivity(new Intent(this, ManageAccountActivity.class)); + } else { + startActivity(new Intent(this, EditAccountActivity.class)); + } finish(); } } else if (conversationList.size() <= 0) { - if (!mRedirected) { - this.mRedirected = true; + if (mRedirected.compareAndSet(false,true)) { Intent intent = new Intent(this, StartConversationActivity.class); intent.putExtra("init",true); startActivity(intent); @@ -1349,7 +1358,7 @@ public class ConversationActivity extends XmppActivity @Override public void userInputRequried(PendingIntent pi, - Message message) { + Message message) { ConversationActivity.this.runIntent(pi, ConversationActivity.REQUEST_SEND_MESSAGE); } @@ -1406,25 +1415,11 @@ public class ConversationActivity extends XmppActivity @Override protected void refreshUiReal() { updateConversationList(); - if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 0) { - if (!mRedirected) { - this.mRedirected = true; - startActivity(new Intent(this, EditAccountActivity.class)); - finish(); - } - } else if (conversationList.size() == 0) { - if (!mRedirected) { - this.mRedirected = true; - Intent intent = new Intent(this, StartConversationActivity.class); - intent.putExtra("init",true); - startActivity(intent); - finish(); - } - } else { + if (conversationList.size() > 0) { ConversationActivity.this.mConversationFragment.updateMessages(); updateActionBarTitle(); + invalidateOptionsMenu(); } - invalidateOptionsMenu(); } @Override diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java index 6024177ae..ebc50566d 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -1,6 +1,8 @@ package eu.siacs.conversations.ui; +import android.app.ActionBar; import android.app.AlertDialog; +import android.content.ActivityNotFoundException; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; @@ -20,6 +22,7 @@ import android.widget.Toast; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; @@ -35,6 +38,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda protected final List accountList = new ArrayList<>(); protected ListView accountListView; protected AccountAdapter mAccountAdapter; + protected AtomicBoolean mInvokedAddAccount = new AtomicBoolean(false); @Override public void onAccountUpdate() { @@ -47,6 +51,11 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda accountList.clear(); accountList.addAll(xmppConnectionService.getAccounts()); } + ActionBar actionBar = getActionBar(); + if (actionBar != null) { + actionBar.setHomeButtonEnabled(this.accountList.size() > 0); + actionBar.setDisplayHomeAsUpEnabled(this.accountList.size() > 0); + } invalidateOptionsMenu(); mAccountAdapter.notifyDataSetChanged(); } @@ -93,9 +102,12 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda @Override void onBackendConnected() { - this.accountList.clear(); - this.accountList.addAll(xmppConnectionService.getAccounts()); - mAccountAdapter.notifyDataSetChanged(); + refreshUiReal(); + if (Config.X509_VERIFICATION && this.accountList.size() == 0) { + if (mInvokedAddAccount.compareAndSet(false,true)) { + addAccountFromKey(); + } + } } @Override @@ -195,7 +207,11 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda } private void addAccountFromKey() { - KeyChain.choosePrivateKeyAlias(this, this, null, null, null, -1, null); + try { + KeyChain.choosePrivateKeyAlias(this, this, null, null, null, -1, null); + } catch (ActivityNotFoundException e) { + Toast.makeText(this,R.string.device_does_not_support_certificates,Toast.LENGTH_LONG).show(); + } } private void publishAvatar(Account account) { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6a6bfa46f..c4ba759b0 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -535,4 +535,5 @@ Renew certificate Error fetching OMEMO key! Verified OMEMO key with certificate! + Your device does not support the selection of client certificates!