Merge pull request #334 from filipedelimabrito/develop

Fix #268

android-ddp/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'me.tatarka:gradle-retrolambda:3.6.1'
         classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
     }

app/build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

app/src/main/java/chat/rocket/android/helper/OnBackPressListener.java

@@ -10,4 +10,4 @@ public interface OnBackPressListener {
    * @return whether back is handled or not.
    */
   boolean onBackPressed();
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/renderer/MessageRenderer.java

@@ -40,8 +40,7 @@ public class MessageRenderer extends AbstractRenderer<Message> {
    */
   public MessageRenderer avatarInto(RocketChatAvatar rocketChatAvatar, AbsoluteUrl absoluteUrl) {
     if (object.getSyncState() == SyncState.FAILED) {
-      rocketChatAvatar.loadImage(VectorDrawableCompat
-          .create(context.getResources(), R.drawable.ic_error_outline_black_24dp, null));
+      rocketChatAvatar.loadImage(VectorDrawableCompat.create(context.getResources(), R.drawable.ic_error_outline_black_24dp, null));
     } else if (TextUtils.isEmpty(object.getAvatar())) {
       userRenderer.avatarInto(rocketChatAvatar, absoluteUrl);
     } else {
@@ -76,10 +75,12 @@ public class MessageRenderer extends AbstractRenderer<Message> {
     }
 
     switch (object.getSyncState()) {
-      case SyncState.NOT_SYNCED:
       case SyncState.SYNCING:
         textView.setText(R.string.sending);
         break;
+      case SyncState.FAILED:
+        textView.setText(R.string.failed_to_sync);
+        break;
       default:
         textView.setText(DateTime.fromEpocMs(object.getTimestamp(), DateTime.Format.TIME));
         break;

app/src/main/java/chat/rocket/android/service/observer/NewMessageObserver.java

@@ -21,8 +21,7 @@ public class NewMessageObserver extends AbstractModelObserver<RealmMessage> {
 
   private final MethodCallHelper methodCall;
 
-  public NewMessageObserver(Context context, String hostname,
-                            RealmHelper realmHelper, DDPClientRef ddpClientRef) {
+  public NewMessageObserver(Context context, String hostname, RealmHelper realmHelper, DDPClientRef ddpClientRef) {
     super(context, hostname, realmHelper, ddpClientRef);
     methodCall = new MethodCallHelper(realmHelper, ddpClientRef);
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/message_list_root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/messageListRelativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="chat.rocket.android.fragment.chatroom.RoomFragment">
 
     <android.support.v7.widget.RecyclerView
-            android:id="@+id/recyclerview"
+            android:id="@+id/messageRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/message_composer" />
+            android:layout_above="@+id/messageComposer" />
 
     <chat.rocket.android.widget.message.MessageFormLayout
-            android:id="@+id/message_composer"
+            android:id="@+id/messageComposer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/Theme.AppCompat.Light"
-            android:layout_alignParentBottom="true" />
+            android:layout_alignParentBottom="true"
+            android:theme="@style/Theme.AppCompat.Light" />
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -16,6 +16,7 @@
     <string name="users_of_room_title">Members List</string>
     <string name="fmt_room_user_count">Total: %,d users</string>
     <string name="sending">Sending…</string>
+    <string name="failed_to_sync">Failed to send!</string>
     <string name="resend">Resend</string>
     <string name="discard">Discard</string>
 

log-wrapper/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 

persistence-realm/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'io.realm:realm-gradle-plugin:2.3.2'
         classpath 'me.tatarka:gradle-retrolambda:3.5.0'
         classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'

rocket-chat-android-widgets/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }