aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu
diff options
context:
space:
mode:
authorMichael <betheg@bitcloner.org>2014-08-29 23:30:47 +0200
committerMichael <betheg@bitcloner.org>2014-08-29 23:30:47 +0200
commit3714947d5f9307b173fdaf7b0fc08d92fd824553 (patch)
tree1257249aa0b0d017170bce7c9349f48cbe68af05 /src/eu
parent98dabe9ab488ab92ff255cb04feaaddad6488c12 (diff)
parent5450a2ae469a84f5c285aeaf68135684ad6aae27 (diff)
Merge remote-tracking branch 'upstream/development' into fix_typo
Diffstat (limited to 'src/eu')
-rw-r--r--src/eu/siacs/conversations/ui/EditAccountActivity.java6
-rw-r--r--src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java4
-rw-r--r--src/eu/siacs/conversations/ui/StartConversationActivity.java4
3 files changed, 11 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/ui/EditAccountActivity.java b/src/eu/siacs/conversations/ui/EditAccountActivity.java
index 2d24aa49..d98a0ca7 100644
--- a/src/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -201,7 +201,11 @@ public class EditAccountActivity extends XmppActivity {
this.mSaveButton.setEnabled(true);
this.mSaveButton.setTextColor(getPrimaryTextColor());
if (jidToEdit != null) {
- this.mSaveButton.setText(R.string.connect);
+ if (mAccount!= null && mAccount.getStatus() == Account.STATUS_ONLINE) {
+ this.mSaveButton.setText(R.string.save);
+ } else {
+ this.mSaveButton.setText(R.string.connect);
+ }
} else {
this.mSaveButton.setText(R.string.next);
}
diff --git a/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index c4c1b45e..c979d137 100644
--- a/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -61,7 +61,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
public void run() {
hintOrWarning.setText(errorCode);
hintOrWarning.setTextColor(getWarningTextColor());
- publishButton.setText(R.string.publish_avatar);
+ publishButton.setText(R.string.publish);
enablePublishButton();
}
});
@@ -211,7 +211,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
this.avatar.setImageBitmap(bm);
if (support) {
enablePublishButton();
- this.publishButton.setText(R.string.publish_avatar);
+ this.publishButton.setText(R.string.publish);
this.hintOrWarning.setText(R.string.publish_avatar_explanation);
this.hintOrWarning.setTextColor(getPrimaryTextColor());
} else {
diff --git a/src/eu/siacs/conversations/ui/StartConversationActivity.java b/src/eu/siacs/conversations/ui/StartConversationActivity.java
index bcb9f1dd..bd66bd94 100644
--- a/src/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -340,6 +340,10 @@ public class StartConversationActivity extends XmppActivity {
String contactJid = jid.getText().toString();
Account account = xmppConnectionService
.findAccountByJid(accountJid);
+ if (account==null) {
+ dialog.dismiss();
+ return;
+ }
Contact contact = account.getRoster().getContact(
contactJid);
if (contact.showInRoster()) {