From 68c45f6831bf4da3eff1b8631553c02413e1ab91 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 14 Feb 2019 03:36:00 +0100
Subject: [PATCH] Fix #461 and #457

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/build.gradle                                    |  2 +-
 .../nextcloud/talk/controllers/ChatController.java  |  6 ++++--
 .../talk/controllers/base/BaseController.java       | 13 +++++++++++++
 app/src/main/res/layout/emoji_view.xml              | 13 ++++++-------
 app/src/main/res/layout/view_message_input.xml      |  2 +-
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e0ba3da4f..e631c6cde 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -114,7 +114,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
-    implementation 'com.github.vanniktech.Emoji:emoji-twitter:182e1ff4f4'
+    implementation 'com.github.vanniktech:Emoji:746caa4623'
     implementation 'org.michaelevans.colorart:library:0.0.3'
     implementation "android.arch.work:work-runtime:${workVersion}"
     implementation "android.arch.work:work-rxjava2:${workVersion}"
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 20695308e..34e2d40b7 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -463,8 +463,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
         emojiPopup = EmojiPopup.Builder.fromRootView(view).setOnEmojiPopupShownListener(new OnEmojiPopupShownListener() {
             @Override
             public void onEmojiPopupShown() {
-                smileyButton.setColorFilter(getResources().getColor(R.color.colorPrimary),
-                        PorterDuff.Mode.SRC_IN);
+                if (getResources() != null) {
+                    smileyButton.setColorFilter(getResources().getColor(R.color.colorPrimary),
+                            PorterDuff.Mode.SRC_IN);
+                }
             }
         }).setOnEmojiPopupDismissListener(new OnEmojiPopupDismissListener() {
             @Override
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java
index 7635a1025..36a995fa4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java
@@ -18,11 +18,13 @@
  */
 package com.nextcloud.talk.controllers.base;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 
+import android.view.inputmethod.InputMethodManager;
 import com.bluelinelabs.conductor.Controller;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.controllers.AccountVerificationController;
@@ -47,6 +49,8 @@ public abstract class BaseController extends ButterKnifeController {
     private static final String TAG = "BaseController";
     @Inject
     AppPreferences appPreferences;
+    @Inject
+    Context context;
 
     protected BaseController() {
         cleanTempCertPreference();
@@ -109,6 +113,15 @@ public abstract class BaseController extends ButterKnifeController {
         super.onAttach(view);
     }
 
+    @Override
+    protected void onDetach(@NonNull View view) {
+        super.onDetach(view);
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
+    }
+
     protected void setTitle() {
         Controller parentController = getParentController();
         while (parentController != null) {
diff --git a/app/src/main/res/layout/emoji_view.xml b/app/src/main/res/layout/emoji_view.xml
index 3ae7f332b..c6691dd92 100644
--- a/app/src/main/res/layout/emoji_view.xml
+++ b/app/src/main/res/layout/emoji_view.xml
@@ -23,22 +23,21 @@
     android:layout_height="wrap_content">
 
     <androidx.viewpager.widget.ViewPager
-        android:id="@+id/emojis_pager"
+        android:id="@+id/emojiViewPager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/emoji_divider" />
+        android:layout_above="@+id/emojiViewDivider" />
 
     <View
-        android:id="@+id/emoji_divider"
+        android:id="@+id/emojiViewDivider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_above="@id/emojis_tab"/>
+        android:layout_above="@id/emojiViewTab"/>
 
     <LinearLayout
-        android:id="@+id/emojis_tab"
+        android:id="@+id/emojiViewTab"
         android:layout_width="match_parent"
         android:layout_height="36dp"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal" />
-
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/view_message_input.xml b/app/src/main/res/layout/view_message_input.xml
index 8411e0247..4e928b05f 100644
--- a/app/src/main/res/layout/view_message_input.xml
+++ b/app/src/main/res/layout/view_message_input.xml
@@ -40,7 +40,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:imeOptions="actionDone|flagNoFullscreen"
+        android:imeOptions="actionDone"
         android:layout_toStartOf="@id/sendButtonSpace"
         android:inputType="textAutoCorrect|textMultiLine|textCapSentences"/>