Merge branch 'beta' into fix/chat_history_sync

app/build.gradle

@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2040
+        versionCode 2041
         versionName "2.6.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -13,6 +13,10 @@ import chat.rocket.android.BuildConfig
 import chat.rocket.android.dagger.DaggerAppComponent
 import chat.rocket.android.dagger.injector.HasWorkerInjector
 import chat.rocket.android.dagger.qualifier.ForMessages
+import chat.rocket.android.emoji.Emoji
+import chat.rocket.android.emoji.EmojiRepository
+import chat.rocket.android.emoji.Fitzpatrick
+import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.helper.CrashlyticsTree
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.AccountsRepository
@@ -20,7 +24,12 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.SITE_URL
 import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryIO
 import chat.rocket.android.util.setupFabric
+import chat.rocket.common.RocketChatException
+import chat.rocket.core.internal.rest.getCustomEmojis
 import com.facebook.drawee.backends.pipeline.DraweeConfig
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipelineConfig
@@ -30,6 +39,7 @@ import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
 import dagger.android.HasBroadcastReceiverInjector
 import dagger.android.HasServiceInjector
+import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -68,6 +78,8 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
     lateinit var localRepository: LocalRepository
     @Inject
     lateinit var accountRepository: AccountsRepository
+    @Inject
+    lateinit var factory: RocketChatClientFactory
 
     @Inject
     @field:ForMessages
@@ -103,6 +115,9 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         // TODO - remove REALM files.
         // TODO - remove this
         checkCurrentServer()
+
+        // TODO - FIXME - we need to proper inject the EmojiRepository and initialize it properly
+        loadEmojis()
     }
 
     private fun checkCurrentServer() {
@@ -151,6 +166,43 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
             return context?.get()
         }
     }
+
+    // TODO - FIXME - This is a big Workaround
+    /**
+     * Load all emojis for the current server. Simple emojis are always the same for every server,
+     * but custom emojis vary according to the its url.
+     */
+    fun loadEmojis() {
+        val currentServer = getCurrentServerInteractor.get()
+        currentServer?.let { server ->
+            launch {
+                val client = factory.create(server)
+                EmojiRepository.setCurrentServerUrl(server)
+                val customEmojiList = mutableListOf<Emoji>()
+                try {
+                    for (customEmoji in retryIO("getCustomEmojis()") { client.getCustomEmojis() }) {
+                        customEmojiList.add(Emoji(
+                                shortname = ":${customEmoji.name}:",
+                                category = EmojiCategory.CUSTOM.name,
+                                url = "$currentServer/emoji-custom/${customEmoji.name}.${customEmoji.extension}",
+                                count = 0,
+                                fitzpatrick = Fitzpatrick.Default.type,
+                                keywords = customEmoji.aliases,
+                                shortnameAlternates = customEmoji.aliases,
+                                siblings = mutableListOf(),
+                                unicode = "",
+                                isDefault = true
+                        ))
+                    }
+
+                    EmojiRepository.load(this@RocketChatApplication, customEmojis = customEmojiList)
+                } catch (ex: RocketChatException) {
+                    Timber.e(ex)
+                    EmojiRepository.load(this@RocketChatApplication as Context)
+                }
+            }
+        }
+    }
 }
 
 private fun LocalRepository.needOldMessagesCleanUp() = getBoolean(CLEANUP_OLD_MESSAGES_NEEDED, true)

app/src/main/java/chat/rocket/android/chatroom/ui/Dialog.kt

@@ -11,6 +11,9 @@ import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 
 fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
+    imagePreview.isVisible = false
+    audioVideoAttachment.isVisible = false
+    textFile.isVisible = false
     var bitmap: Bitmap? = null
 
     activity?.let { context ->
@@ -22,16 +25,16 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
                         .with(context)
                         .asBitmap()
                         .load(uri)
-                        .override(500, 500)
-                        .centerCrop()
+                        .override(imagePreview.width, imagePreview.height)
+                        .fitCenter()
                         .into(object : SimpleTarget<Bitmap>() {
                             override fun onResourceReady(
                                 resource: Bitmap,
                                 transition: Transition<in Bitmap>?
                             ) {
                                 bitmap = resource
-                                imagePreview.isVisible = true
                                 imagePreview.setImageBitmap(resource)
+                                imagePreview.isVisible = true
                             }
                         })
                 }

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -59,7 +59,7 @@ class MainPresenter @Inject constructor(
     private val saveAccountInteractor: SaveAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
     private val removeAccountInteractor: RemoveAccountInteractor,
-    private val factory: RocketChatClientFactory,
+    factory: RocketChatClientFactory,
     private val groupedPush: GroupedPush,
     dbManagerFactory: DatabaseManagerFactory,
     getSettingsInteractor: GetSettingsInteractor,

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

 <resources>
+
     <!-- Titles -->
     <string name="title_sign_in_your_server">Anmelden am Server</string>
     <string name="title_log_in">Anmelden</string>
@@ -70,7 +71,6 @@
     <string name="msg_invalid_email">Bitte eine korrekte E-Mail Adresse eingeben</string>
     <string name="msg_new_user_agreement">Beim weitergehen akzeptieren Sie usere\n%1$s und %2$s</string>
     <string name="msg_2fa_code">2FA Code</string>
-    <!-- <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string> -->
     <string name="msg_yesterday">Gestern</string>
     <string name="msg_today">Heute</string>
     <string name="msg_message">Nachricht</string>
@@ -104,11 +104,8 @@
     <string name="msg_no_messages_yet">Noch keine Nachrichten</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Server Version veraltet. Bitte kontaktieren Sie ihren Server Administrator.</string>
-    <string name="msg_ver_not_recommended">
-        Die Server Version scheint älter als die empfolene Version %1$s zu sein.\nSie können sich trotzdem einloggen, aber es kann zu einem unerwartetem Verhalten kommen.</string>
-    <string name="msg_ver_not_minimum">
-        Die Server Version scheint älter als die minimale Version %1$s zu sein.\nBitte updaten Sie Ihren Server um sich einloggen zu können!
-    </string>
+    <string name="msg_ver_not_recommended">Die Server Version scheint älter als die empfolene Version %1$s zu sein.\nSie können sich trotzdem einloggen, aber es kann zu einem unerwartetem Verhalten kommen.</string>
+    <string name="msg_ver_not_minimum">Die Server Version scheint älter als die minimale Version %1$s zu sein.\nBitte updaten Sie Ihren Server um sich einloggen zu können!</string>
     <string name="msg_no_chat_title">Keine Chat Nachrichten</string>
     <string name="msg_no_chat_description">Starte die Konversation um Ihre \nNachrichten hier zu sehen.</string>
     <string name="msg_proceed">WEITER</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -12,9 +12,9 @@
     <string name="title_profile">प्रोफाइल</string>
     <string name="title_members">सदस्य (%d)</string>
     <string name="title_settings">सेटिंग्स</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_preferences">प्राथमिकताएँ</string>
     <string name="title_change_password">पासवर्ड बदलें</string>
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">एडमिन पैनल</string>
     <string name="title_password">पासवर्ड बदलें</string>
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
     <string name="title_about">परिचय</string>
@@ -42,13 +42,13 @@
     <string name="action_invisible">अदृश्य</string>
     <string name="action_save_to_gallery">गैलरी में सहेजें</string>
     <string name="action_drawing">चित्रकारी</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">गैलरी से फोटो का चयन करें</string>
+    <string name="action_take_photo">फोटो खेचिये</string>
+    <string name="action_reset_avatar">अवतार रीसेट करें</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_preferences">प्राथमिकताएँ</item>
         <item name="item_password">पासवर्ड बदलें</item>
         <item name="item_password">परिचय</item>
     </string-array>
@@ -85,7 +85,7 @@
     <string name="msg_content_description_log_in_using_meteor">Meteor द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_twitter">Twitter द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_gitlab">Gitlab द्वारा लॉगिन करें</string>
-    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">WordPress द्वारा लॉगिन करें</string>
     <string name="msg_content_description_send_message">मेसेज भेजें</string>
     <string name="msg_content_description_show_attachment_options">अटैचमेंट विकल्प दिखाएं</string>
     <string name="msg_you">आप</string>
@@ -147,10 +147,10 @@
     <string name="msg_channel_created_successfully">चैनल सफलतापूर्वक बनाया गया</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">एनालिटिक्स ट्रैकिंग</string>
+    <string name="msg_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अज्ञात स्टेटिक्स भेजें</string>
+    <string name="msg_do_not_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अनाम स्टेटिक न भेजें</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">लागू नहीं है क्योंकि यह एक FOSS संस्करण है</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s ने रूम का नाम बदलकर %1$s किया</string>
@@ -190,8 +190,7 @@
     <string name="permission_starring_not_allowed">तारांकित की अनुमति नहीं है</string>
 
     <!-- Search message -->
-    <!-- TODO Add proper translation-->
-    <string name="title_search_message">Search message</string>
+    <string name="title_search_message">संदेश खोजें</string>
 
     <!-- Favorite/Unfavorite chat room -->
     <string name="title_favorite_chat">पसंदीदा चैट</string>
@@ -270,7 +269,7 @@
     <string name="dialog_sort_by_activity">गतिविधि</string>
     <string name="dialog_group_by_type">प्रकार के आधार पर समूह</string>
     <string name="dialog_group_favourites">पसंदीदा समूह</string>
-    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
+    <string name="dialog_button_done">पूर्ण</string>
     <string name="chatroom_header">हैडर</string>
 
     <!--ChatRooms Headers-->

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

@@ -73,7 +73,6 @@
     <string name="msg_invalid_email">有効なメールアドレスを入力してください</string>
     <string name="msg_new_user_agreement">サインアップすることで、\n%1$s と %2$s に同意したとみなします。</string>
     <string name="msg_2fa_code">2FA コード</string>
-    <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string>
     <string name="msg_today">Today</string> <!-- TODO Add translation -->
     <string name="msg_yesterday">昨日</string>
     <string name="msg_message">メッセージ</string>

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

+<!--
+REMARK:
+
+When adding a new string in this file do not forget to add a proper translation for the
+corresponding supported language - if applicable.
+
+Please, follow the rules as shown here (by adding a new string in the correct section).
+
+Coding style:
+https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strings
+-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">Rocket.Chat</string>
 

emoji/src/main/java/chat/rocket/android/emoji/EmojiRepository.kt

@@ -3,11 +3,13 @@ package chat.rocket.android.emoji
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Typeface
+import android.util.Log
 import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.PREF_EMOJI_RECENTS
 import chat.rocket.android.emoji.internal.db.EmojiDatabase
 import chat.rocket.android.emoji.internal.isCustom
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.GlideException
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
@@ -110,10 +112,17 @@ object EmojiRepository {
             val px = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_large)
 
             customEmojis.forEach {
+                try {
                     val future = Glide.with(context)
                             .load(it.url)
                             .submit(px, px)
                     future.get()
+                } catch (ex: Exception) {
+                    Log.d("EmojiRepository", "Error fetching custom emoji ${it.shortname}", ex)
+                    if (ex is GlideException) {
+                        ex.logRootCauses("EmojiRepository")
+                    }
+                }
             }
         }
     }