Merge branch 'release/1.0.19'

app/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 184
-        versionName '1.0.12'
+        versionCode 191
+        versionName '1.0.19'
     }
 
     compileOptions {
@@ -41,8 +41,8 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.1.1'
-    compile 'com.android.support:support-v13:22.0.0'
+    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:support-v13:22.2.0'
     compile 'com.github.ksoichiro:android-observablescrollview:1.5.0'
     compile 'de.hdodenhof:circleimageview:1.2.2'
     compile 'com.melnykov:floatingactionbutton:1.2.0'

app/src/main/java/com/xabber/android/data/extension/otr/SMProgress.java

@@ -31,8 +31,7 @@ public class SMProgress extends BaseEntity implements EntityNotificationItem {
 
     @Override
     public Intent getIntent() {
-        return QuestionViewer.createCancelIntent(
-                Application.getInstance(), account, user);
+        return QuestionViewer.createCancelIntent(Application.getInstance(), account, user);
     }
 
     @Override
@@ -43,8 +42,7 @@ public class SMProgress extends BaseEntity implements EntityNotificationItem {
 
     @Override
     public String getText() {
-        return Application.getInstance().getString(
-                R.string.otr_verification_in_progress);
+        return Application.getInstance().getString(R.string.otr_verification_in_progress);
     }
 
 }

app/src/main/java/com/xabber/android/data/extension/otr/SMRequest.java

@@ -35,8 +35,7 @@ public class SMRequest extends BaseEntity implements EntityNotificationItem {
     @Override
     public Intent getIntent() {
         return QuestionViewer.createIntent(
-                Application.getInstance(), account, user, question != null,
-                true, question);
+                Application.getInstance(), account, user, question != null, true, question);
     }
 
     @Override

app/src/main/java/com/xabber/android/data/message/RegularChat.java

@@ -14,14 +14,6 @@
  */
 package com.xabber.android.data.message;
 
-import net.java.otr4j.OtrException;
-
-import org.jivesoftware.smack.packet.Message;
-import org.jivesoftware.smack.packet.Message.Type;
-import org.jivesoftware.smack.packet.Packet;
-import org.jivesoftware.smack.packet.Presence;
-import org.jivesoftware.smackx.packet.MUCUser;
-
 import com.xabber.android.data.LogManager;
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.SettingsManager;
@@ -35,6 +27,14 @@ import com.xabber.xmpp.archive.SaveMode;
 import com.xabber.xmpp.delay.Delay;
 import com.xabber.xmpp.muc.MUC;
 
+import net.java.otr4j.OtrException;
+
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Message.Type;
+import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smackx.packet.MUCUser;
+
 /**
  * Represents normal chat.
  *
@@ -141,8 +141,7 @@ public class RegularChat extends AbstractChat {
             updateThreadId(thread);
             boolean unencrypted = false;
             try {
-                text = OTRManager.getInstance().transformReceiving(account,
-                        user, text);
+                text = OTRManager.getInstance().transformReceiving(account, user, text);
             } catch (OtrException e) {
                 if (e.getCause() instanceof OTRUnencryptedException) {
                     text = ((OTRUnencryptedException) e.getCause()).getText();
@@ -154,7 +153,7 @@ public class RegularChat extends AbstractChat {
                 }
             }
             // System message received.
-            if (text == null)
+            if (text == null || text.trim().equals(""))
                 return true;
             if (!"".equals(resource))
                 this.resource = resource;

app/src/main/java/com/xabber/android/ui/ChatViewer.java

@@ -356,21 +356,29 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
             chatScrollIndicatorAdapter.update(chatViewerAdapter.getActiveChats());
             selectPage();
         } else {
-            updateRegisteredChats();
-            updateRegisteredRecentChatsFragments();
-            updateStatusBar();
-
             for (ChatViewerFragment chat : registeredChats) {
-                if (chat.isEqual(selectedChat) && incoming) {
-                    chat.playIncomingAnimation();
+                if (chat.isEqual(selectedChat)) {
+                    chat.updateChat();
+                    if (incoming) {
+                        chat.playIncomingAnimation();
+                    }
                 }
             }
+            updateRegisteredRecentChatsFragments();
+            updateStatusBar();
         }
     }
 
     @Override
     public void onContactsChanged(Collection<BaseEntity> entities) {
-        updateRegisteredChats();
+        for (BaseEntity contact : entities) {
+            for (ChatViewerFragment chat : registeredChats) {
+                if (chat.isEqual(contact)) {
+                    chat.updateChat();
+                }
+            }
+        }
+
         updateRegisteredRecentChatsFragments();
         updateStatusBar();
     }

app/src/main/java/com/xabber/android/ui/ContactEditor.java

@@ -5,12 +5,10 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
 import android.support.v7.widget.Toolbar;
 import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.EditText;
 
 import com.xabber.android.R;
@@ -39,15 +37,6 @@ public class ContactEditor extends ContactViewer implements Toolbar.OnMenuItemCl
             toolbar.inflateMenu(R.menu.contact_viewer);
             toolbar.setOnMenuItemClickListener(this);
         }
-
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                NavUtils.navigateUpFromSameTask(ContactEditor.this);
-            }
-        });
-
     }
 
     @Override

app/src/main/java/com/xabber/android/ui/ContactList.java

@@ -66,6 +66,7 @@ import com.xabber.android.ui.helper.BarPainter;
 import com.xabber.android.ui.helper.ManagedActivity;
 import com.xabber.android.ui.preferences.AboutViewer;
 import com.xabber.android.ui.preferences.AccountEditor;
+import com.xabber.android.ui.preferences.AccountList;
 import com.xabber.android.ui.preferences.PreferenceEditor;
 import com.xabber.xmpp.address.Jid;
 import com.xabber.xmpp.uri.XMPPUri;
@@ -593,7 +594,9 @@ public class ContactList extends ManagedActivity implements OnAccountChangedList
             case R.id.drawer_action_exit:
                 exit();
                 break;
-
+            case R.id.drawer_header_action_xmpp_accounts:
+                startActivity(AccountList.createIntent(this));
+                break;
         }
     }
 

app/src/main/java/com/xabber/android/ui/ContactListDrawerFragment.java

@@ -52,8 +52,8 @@ public class ContactListDrawerFragment extends Fragment implements View.OnClickL
 
         View headerView = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE))
                 .inflate(R.layout.contact_list_drawer_header, listView, false);
-        headerTitle = headerView.findViewById(R.id.drawer_header_title);
-
+        headerTitle = headerView.findViewById(R.id.drawer_header_action_xmpp_accounts);
+        headerTitle.setOnClickListener(this);
 
         listView.addHeaderView(headerView);
 

app/src/main/java/com/xabber/android/ui/ContactViewer.java

@@ -18,6 +18,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
 
@@ -117,6 +119,15 @@ public class ContactViewer extends ManagedActivity implements
         contactTitleView.findViewById(R.id.status_icon).setVisibility(View.GONE);
         contactTitleView.findViewById(R.id.status_text).setVisibility(View.GONE);
         contactNameView = (TextView) contactTitleView.findViewById(R.id.name);
+
+        Toolbar toolbar = contactTitleExpandableToolbarInflater.getToolbar();
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                NavUtils.navigateUpFromSameTask(ContactViewer.this);
+            }
+        });
     }
 
     @Override

app/src/main/java/com/xabber/android/ui/adapter/ChatMessageAdapter.java

@@ -23,6 +23,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.xabber.android.R;
+import com.xabber.android.data.LogManager;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
@@ -139,6 +140,7 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             incomingMessage.messageBalloon.setVisibility(View.GONE);
             incomingMessage.messageTime.setVisibility(View.GONE);
             incomingMessage.avatar.setVisibility(View.GONE);
+            LogManager.w(this, "Empty message! Hidden, but need to correct");
         } else {
             incomingMessage.messageBalloon.setVisibility(View.VISIBLE);
             incomingMessage.messageTime.setVisibility(View.VISIBLE);
@@ -285,7 +287,7 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         return null;
     }
 
-    public static class BasicMessage  extends RecyclerView.ViewHolder {
+    public static class BasicMessage extends RecyclerView.ViewHolder {
 
         public TextView messageText;
 

app/src/main/res/layout/contact_list_drawer_header.xml

@@ -4,8 +4,8 @@
     android:layout_height="wrap_content">
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/drawer_header_title"
-        android:layout_width="wrap_content"
+        android:id="@+id/drawer_header_action_xmpp_accounts"
+        android:layout_width="match_parent"
         android:layout_height="48dp"
         android:gravity="center_vertical"
         android:paddingLeft="16dp"