From 33172246c9a038cefb68d12477513afcb64f89d2 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 29 Aug 2014 10:24:25 +0200 Subject: fixed #389 --- src/eu/siacs/conversations/ui/EditAccountActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/eu/siacs/conversations') 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); } -- cgit v1.2.3 From b0d777d9ca721f44d2efa2b9e0729d99aa5057b5 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 29 Aug 2014 12:14:10 +0200 Subject: fixed npe --- src/eu/siacs/conversations/ui/StartConversationActivity.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/eu/siacs/conversations') 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()) { -- cgit v1.2.3 From 5450a2ae469a84f5c285aeaf68135684ad6aae27 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 29 Aug 2014 14:05:10 +0200 Subject: fixed link to old resource --- src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/eu/siacs/conversations') 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 { -- cgit v1.2.3