Merge branch 'release/1.0.169'

redsolution · Apr 6, 2017 · 88d86d5 · 88d86d5
2 parents 106356e + bb64c57
commit 88d86d5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/xabber/build.gradle b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 340
-        versionName '1.0.168'
+        versionCode 341
+        versionName '1.0.169'
     }
 
     lintOptions {

diff --git a/xabber/src/main/java/com/xabber/android/data/connection/ConnectionThread.java b/xabber/src/main/java/com/xabber/android/data/connection/ConnectionThread.java
@@ -15,6 +15,7 @@
 package com.xabber.android.data.connection;
 
 import android.support.annotation.NonNull;
+import android.util.Log;
 
 import com.xabber.android.data.account.AccountErrorEvent;
 import com.xabber.android.data.account.AccountItem;
@@ -62,7 +63,7 @@ public void run() {
                     LogManager.i(this, "No network connection");
                 }
             }
-        }, "Connection thread for " + connectionItem.getAccount());
+        });
         thread.setPriority(Thread.MIN_PRIORITY);
         thread.setDaemon(true);
     }
@@ -122,14 +123,17 @@ void connectAndLogin() {
             com.xabber.android.data.account.AccountManager.getInstance().addAccountError(accountErrorEvent);
             com.xabber.android.data.account.AccountManager.getInstance().setEnabled(connectionItem.getAccount(), false);
             EventBus.getDefault().postSticky(accountErrorEvent);
-        } catch (XMPPException | SmackException | IOException e) {
+
+            // catching RuntimeExceptions seems to be strange, but we got a lot of error coming from
+            // Smack or mini DSN client inside of Smack.
+        } catch (XMPPException | SmackException | IOException | RuntimeException e) {
             LogManager.exception(this, e);
 
             if (!((AccountItem)connectionItem).isSuccessfulConnectionHappened()) {
                 LogManager.i(this, "There was no successful connection, disabling account");
 
                 AccountErrorEvent accountErrorEvent = new AccountErrorEvent(connectionItem.getAccount(),
-                        AccountErrorEvent.Type.CONNECTION, e.getMessage());
+                        AccountErrorEvent.Type.CONNECTION, Log.getStackTraceString(e));
 
                 com.xabber.android.data.account.AccountManager.getInstance().addAccountError(accountErrorEvent);
                 com.xabber.android.data.account.AccountManager.getInstance().setEnabled(connectionItem.getAccount(), false);

diff --git a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
@@ -243,22 +243,18 @@ protected boolean onPacket(UserJid bareAddress, Stanza stanza) {
                     notify = false;
                 }
 
-                Realm realm = MessageDatabaseManager.getInstance().getNewBackgroundRealm();
+                Realm realm = MessageDatabaseManager.getInstance().getRealmUiThread();
                 final MessageItem sameMessage = realm
                         .where(MessageItem.class)
                         .equalTo(MessageItem.Fields.STANZA_ID, stanzaId)
                         .findFirst();
 
-                try {
-                    // Server send our own message back
-                    if (sameMessage != null) {
-                        realm.beginTransaction();
-                        sameMessage.setDelivered(true);
-                        realm.commitTransaction();
-                        return true;
-                    }
-                } finally {
-                    realm.close();
+                // Server send our own message back
+                if (sameMessage != null) {
+                    realm.beginTransaction();
+                    sameMessage.setDelivered(true);
+                    realm.commitTransaction();
+                    return true;
                 }
 
                 if (isSelf(resource)) { // Own message from other client

diff --git a/xabber/src/main/res/layout/dialog_account_error.xml b/xabber/src/main/res/layout/dialog_account_error.xml
@@ -54,6 +54,7 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:textSize="14sp"
+        android:textIsSelectable="true"
         tools:text="TextView" />
     </ScrollView>