Fixed wrong file start detection

Author: glodanif

app/build.gradle

@@ -105,7 +105,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation "com.android.support:appcompat-v7:$SUPPORT_VERSION"
-    implementation "com.android.support:support-v4:$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"

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

@@ -15,12 +15,15 @@ class TransferEventStrategy : DataTransferThread.EventsStrategy {
 
             if (message != null && fileStartRegex.containsMatchIn(message)) {
 
-                val info = fileStartRegex.replace(message, "")
+                val messageBody = "6#" + message.substringAfter("6#")
+
+                val info = fileStartRegex.replace(messageBody, "")
                 val uid = try {
-                    message.substring(2).substringBefore("#").toLong()
+                    messageBody.substring(2).substringBefore("#").toLong()
                 } catch (e: NumberFormatException) {
 
-                    val exception = NumberFormatException(e.message + " | " + fileStartRegex.find(message)?.value)
+                    //TODO: remove if crash doesn't appear anymore
+                    val exception = NumberFormatException(e.message + " | " + fileStartRegex.find(messageBody)?.value)
 
                     if (Fabric.isInitialized()) {
                         Crashlytics.getInstance().core.logException(exception)
@@ -47,7 +50,7 @@ class TransferEventStrategy : DataTransferThread.EventsStrategy {
                 null
             }
 
-    override fun isFileCanceled(message: String?): DataTransferThread.CancelInfo? =
+    override fun isFileCanceled(message: String?) =
 
             if (message != null && (message.contains("8#0#0#") || message.contains("8#0#1#"))) {
                 val byPartner = message

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

@@ -151,14 +151,14 @@ class ScanActivity : SkeletonActivity(), ScanView {
         startActivityForResult(enableBtIntent, REQUEST_ENABLE_BLUETOOTH)
     }
 
-    override fun showBluetoothIsNotAvailableMessage() {
+    override fun showBluetoothIsNotAvailableMessage() = doIfStarted {
         AlertDialog.Builder(this)
                 .setMessage(R.string.scan__no_access_to_bluetooth)
                 .setPositiveButton(R.string.general__ok, { _, _ -> finish() })
                 .show()
     }
 
-    override fun showBluetoothEnablingFailed() {
+    override fun showBluetoothEnablingFailed() = doIfStarted {
         AlertDialog.Builder(this)
                 .setMessage(R.string.scan__bluetooth_disabled)
                 .setPositiveButton(R.string.general__ok, null)
@@ -195,7 +195,7 @@ class ScanActivity : SkeletonActivity(), ScanView {
         scanForDevicesButton.text = getString(R.string.scan__scan_for_devices)
     }
 
-    override fun showBluetoothDiscoverableFailure() {
+    override fun showBluetoothDiscoverableFailure() = doIfStarted {
         AlertDialog.Builder(this)
                 .setMessage(R.string.scan__unable_to_make_discoverable)
                 .setPositiveButton(R.string.general__ok, null)
@@ -280,7 +280,7 @@ class ScanActivity : SkeletonActivity(), ScanView {
                 .show()
     }
 
-    override fun showExtractionApkFailureMessage() {
+    override fun showExtractionApkFailureMessage() = doIfStarted {
         AlertDialog.Builder(this)
                 .setMessage(R.string.scan__unable_to_fetch_apk)
                 .setPositiveButton(R.string.general__ok, null)

app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ContactsAdapter.kt

@@ -15,7 +15,6 @@ class ContactsAdapter : RecyclerView.Adapter<ContactsAdapter.ContactViewHolder>(
     var clickListener: ((ContactViewModel) -> Unit)? = null
     var conversations: ArrayList<ContactViewModel> = ArrayList()
 
-    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ContactViewHolder, position: Int) {
 
         val contact = conversations[position]

app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ExpiringProgressBar.kt

@@ -76,6 +76,7 @@ class ExpiringProgressBar : View {
     }
 
     private val tick = object : Runnable {
+
         override fun run() {
             if (!isCanceled && timeLeft > 0) {
                 timeLeft--

app/src/main/kotlin/com/glodanif/bluetoothchat/utils/Extensions.kt

@@ -57,13 +57,6 @@ fun Animation.onEnd(action: () -> Unit) {
     })
 }
 
-inline fun <T> MutableSet<T>.safeForEach(action: (T) -> Unit) = this.iterator().let {
-
-    while (it.hasNext()) {
-        action.invoke(it.next())
-    }
-}
-
 fun <T> MutableSet<T>.safeRemove(item: T) = this.iterator().let {
 
     while (it.hasNext()) {