Minor fixes

Author: glodanif

app/build.gradle

@@ -95,7 +95,7 @@ android {
 
 dependencies {
 
-    def final SUPPORT_VERSION = '28.0.0-rc01'
+    def final SUPPORT_VERSION = '28.0.0-rc02'
     def final ROOM_VERSION = '1.1.1'
     def final LIFECYCLE_VERSION = '1.1.1'
     def final LEAK_CANARY_VERSION = '1.6.1'
@@ -105,10 +105,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation "com.android.support:appcompat-v7:$SUPPORT_VERSION"
-    implementation "com.android.support:design:$SUPPORT_VERSION"
     implementation "com.android.support:recyclerview-v7:$SUPPORT_VERSION"
     implementation "com.android.support:cardview-v7:$SUPPORT_VERSION"
-
+    implementation 'com.android.support:design:28.0.0-rc01'
     implementation 'com.android.support.constraint:constraint-layout:2.0.0-alpha2'
 
     implementation "android.arch.persistence.room:runtime:$ROOM_VERSION"
@@ -118,12 +117,12 @@ dependencies {
     implementation "android.arch.lifecycle:extensions:$LIFECYCLE_VERSION"
     kapt "android.arch.lifecycle:compiler:$LIFECYCLE_VERSION"
 
+    implementation 'io.github.kobakei:ratethisapp:1.2.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.github.jkwiecien:EasyImage:2.0.4'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.github.jkwiecien:EasyImage:2.0.4'
     implementation 'me.priyesh:chroma:1.0.2'
-    implementation 'io.github.kobakei:ratethisapp:1.2.0'
 
     implementation 'org.koin:koin-android:1.0.0-RC-1'
 

app/src/main/kotlin/com/glodanif/bluetoothchat/data/service/connection/TransferEventStrategy.kt

@@ -16,15 +16,15 @@ class TransferEventStrategy : DataTransferThread.EventsStrategy {
                 val messageBody = "6#" + message.substringAfter("6#")
 
                 val info = fileStartRegex.replace(messageBody, "")
-                val uid = messageBody.substring(2).substringBefore("#").toLong()
+                val uid = messageBody.substring(2).substringBefore("#")
 
-                if (info.isEmpty()) {
+                if (info.isEmpty() || !uid.isNumber()) {
                     null
                 } else {
                     val size = info.substringAfter("#").substringBefore("#")
                     if (size.isNumber()) {
                         DataTransferThread.FileInfo(
-                                uid,
+                                uid.toLong(),
                                 info.substringBefore("#"),
                                 size.toLong()
                         )

app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ChatActivity.kt

@@ -51,8 +51,6 @@ class ChatActivity : SkeletonActivity(), ChatView {
         parametersOf(deviceAddress ?: "", this)
     }
 
-    private val layoutManager = LinearLayoutManager(this)
-
     private val chatContainer: ConstraintLayout by bind(R.id.cl_chat_container)
     private val actions: ActionView by bind(R.id.av_actions)
     private val chatList: RecyclerView by bind(R.id.rv_chat)
@@ -69,6 +67,10 @@ class ChatActivity : SkeletonActivity(), ChatView {
     private val presharingImage: ImageView by bind(R.id.iv_presharing_image)
     private val goDownButton: GoDownButton by bind(R.id.gdb_go_down)
 
+    private val chatLayoutManager = LinearLayoutManager(this).apply {
+        reverseLayout = true
+    }
+
     private lateinit var scrollBehavior: ScrollAwareBehavior
     private lateinit var chatAdapter: ChatAdapter
 
@@ -136,7 +138,7 @@ class ChatActivity : SkeletonActivity(), ChatView {
         }
 
         goDownButton.setOnClickListener {
-            layoutManager.scrollToPosition(0)
+            chatLayoutManager.scrollToPosition(0)
             scrollBehavior.hideChild()
             goDownButton.setUnreadMessageNumber(0)
         }
@@ -157,9 +159,7 @@ class ChatActivity : SkeletonActivity(), ChatView {
 
         chatList.apply {
 
-            val manager = this@ChatActivity.layoutManager
-            manager.reverseLayout = true
-            layoutManager = manager
+            layoutManager = chatLayoutManager
             adapter = chatAdapter
 
             addOnScrollListener(object : RecyclerView.OnScrollListener() {
@@ -277,7 +277,7 @@ class ChatActivity : SkeletonActivity(), ChatView {
         chatAdapter.messages.addFirst(message)
         chatAdapter.notifyItemInserted(0)
         if (!scrollBehavior.isChildShown()) {
-            layoutManager.scrollToPosition(0)
+            chatLayoutManager.scrollToPosition(0)
         } else {
             goDownButton.setUnreadMessageNumber(goDownButton.getUnreadMessageNumber() + 1)
         }
@@ -286,7 +286,7 @@ class ChatActivity : SkeletonActivity(), ChatView {
     override fun showSentMessage(message: ChatMessageViewModel) {
         chatAdapter.messages.addFirst(message)
         chatAdapter.notifyItemInserted(0)
-        layoutManager.scrollToPosition(0)
+        chatLayoutManager.scrollToPosition(0)
     }
 
     override fun showRejectedConnection() = doIfStarted {

app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/ClickableMovementMethod.kt

@@ -1,5 +1,6 @@
 package com.glodanif.bluetoothchat.ui.util
 
+import android.content.ActivityNotFoundException
 import android.text.Spannable
 import android.text.method.ArrowKeyMovementMethod
 import android.text.style.ClickableSpan
@@ -24,8 +25,12 @@ object ClickableMovementMethod : ArrowKeyMovementMethod() {
             val off = layout.getOffsetForHorizontal(line, x)
             val link = buffer?.getSpans(off, off, ClickableSpan::class.java)
             if (link != null && link.isNotEmpty()) {
-                link[0].onClick(widget)
-                return true
+                try {
+                    link[0].onClick(widget)
+                    return true
+                } catch (e: ActivityNotFoundException) {
+                    e.printStackTrace()
+                }
             }
         }
         return super.onTouchEvent(widget, buffer, event)