Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e750dffb authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Revert "Merge branch 'sprint_istanbul' into 'master'"

This reverts merge request !20
parent 72ca9ff1
Loading
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@
package com.moez.QKSMS.feature.compose

import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.ViewGroup
import com.bumptech.glide.Glide
@@ -81,7 +80,7 @@ class AttachmentAdapter @Inject constructor(
                    .mapNotNull { vCard -> Ezvcard.parse(vCard).first() }
                    .subscribeOn(Schedulers.computation())
                    .observeOn(AndroidSchedulers.mainThread())
                    .subscribe( { vcard -> view.name?.text = vcard.formattedName.value }, { throwable -> Log.i("AttachmentAdapter.kt", "Name field is null") } )
                    .subscribe { vcard -> view.name?.text = vcard.formattedName.value }
        }
    }

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@
package com.moez.QKSMS.feature.compose.part

import android.content.Context
import android.util.Log
import android.view.Gravity
import android.view.View
import android.widget.FrameLayout
@@ -64,7 +63,7 @@ class VCardBinder @Inject constructor(colors: Colors, private val context: Conte
                .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } }
                .subscribeOn(Schedulers.computation())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe( { vcard -> view.name?.text = vcard.formattedName.value }, { throwable -> Log.i("VCardBinder.kt", "Name field is null") } ) 
                .subscribe { vcard -> view.name?.text = vcard.formattedName.value }

        val params = view.vCardBackground.layoutParams as FrameLayout.LayoutParams
        if (!message.isMe()) {