aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/services/AvatarService.java2
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java15
-rw-r--r--src/main/res/values-eu/strings.xml6
3 files changed, 15 insertions, 8 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 1125859c..70c1d4dd 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -113,7 +113,7 @@ public class AvatarService {
if (bitmap != null) {
return bitmap;
}
- List<MucOptions.User> users = mucOptions.getUsers();
+ final List<MucOptions.User> users = new ArrayList<>(mucOptions.getUsers());
int count = users.size();
bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 12237f73..128f61a1 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -813,13 +813,11 @@ public class XmppConnectionService extends Service {
Conversation conversation = find(bookmark);
if (conversation != null) {
conversation.setBookmark(bookmark);
- } else {
- if (bookmark.autojoin()) {
- conversation = findOrCreateConversation(
- account, bookmark.getJid(), true);
- conversation.setBookmark(bookmark);
- joinMuc(conversation);
- }
+ } else if (bookmark.autojoin() && bookmark.getJid() != null) {
+ conversation = findOrCreateConversation(
+ account, bookmark.getJid(), true);
+ conversation.setBookmark(bookmark);
+ joinMuc(conversation);
}
}
}
@@ -980,6 +978,9 @@ public class XmppConnectionService extends Service {
public Conversation find(final List<Conversation> haystack,
final Account account,
final Jid jid) {
+ if (jid == null ) {
+ return null;
+ }
for (Conversation conversation : haystack) {
if ((account == null || conversation.getAccount() == account)
&& (conversation.getContactJid().toBareJid().equals(jid.toBareJid()))) {
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 75452741..41f3793b 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -328,5 +328,11 @@
<string name="pref_show_dynamic_tags">Etiketa dinamikoak erakutsi</string>
<string name="pref_show_dynamic_tags_summary">Irakurtzeko soilik diren etiketak erakutsi kontaktuen azpian</string>
<string name="enable_notifications">Jakinarazpenak gaitu</string>
+ <string name="conference_with">Konferentzia sortu honekin…</string>
+ <string name="no_conference_server_found">Ez da konferentzia zerbitzaririk aurkitu</string>
+ <string name="conference_creation_failed">Konferentzia sortzeak huts egin du!</string>
+ <string name="conference_created">Konferentzia sortu da!</string>
+ <string name="secret_accepted">Sekretua onartu da!</string>
+ <string name="reset">Berrezarri</string>
</resources>