vcard: avoid saving empty profile

Prevents overriding the account profile with an empty profile
if the profile is not synced from other devices yet.

Change-Id: Iad65d2c2b9cc183607c55e0f2cbf7fd516b15074

jami-android/app/src/main/java/cx/ring/services/VCardServiceImpl.kt

@@ -67,14 +67,6 @@ class VCardServiceImpl(private val mContext: Context) : VCardService() {
             .subscribeOn(Schedulers.io())
             .cache()
 
-    override fun peerProfileReceived(accountId: String, peerId: String, vcard: File): Single<Profile> =
-        VCardUtils.peerProfileReceived(mContext.filesDir, accountId, peerId, vcard)
-            .map { vc -> readData(vc) }
-
-    override fun accountProfileReceived(accountId: String, vcardFile: File): Single<Profile> =
-        VCardUtils.accountProfileReceived(mContext.filesDir, accountId, vcardFile)
-            .map { vcard -> readData(vcard) }
-
     override fun loadConversationProfile(info: Map<String, String>): Single<Profile> =
         Single.fromCallable {
             val title = info["title"]

jami-android/libjamiclient/src/main/kotlin/net/jami/services/VCardService.kt

@@ -27,18 +27,15 @@ import java.io.File
 abstract class VCardService {
     abstract fun loadProfile(account: Account): Observable<Profile>
     abstract fun loadSmallVCard(accountId: String, maxSize: Int): Maybe<VCard>
-    fun loadSmallVCardWithDefault(accountId: String, maxSize: Int): Single<VCard> {
-        return loadSmallVCard(accountId, maxSize)
+    fun loadSmallVCardWithDefault(accountId: String, maxSize: Int): Single<VCard> =
+        loadSmallVCard(accountId, maxSize)
             .switchIfEmpty(Single.fromCallable { VCard() })
-    }
 
     abstract fun saveVCardProfile(accountId: String, uri: String?, displayName: String?, picture: String?): Single<VCard>
 
     abstract fun loadVCardProfile(vcard: VCard): Single<Profile>
     abstract fun loadVCard(vcard: File): Single<Profile>
-    abstract fun peerProfileReceived(accountId: String, peerId: String, vcard: File): Single<Profile>
     abstract fun loadConversationProfile(info: Map<String, String>): Single<Profile>
-    abstract fun accountProfileReceived(accountId: String, vcardFile: File): Single<Profile>
     abstract fun base64ToBitmap(base64: String?): Any?
 
     companion object {

jami-android/libjamiclient/src/main/kotlin/net/jami/utils/VCardUtils.kt

@@ -145,7 +145,7 @@ object VCardUtils {
 
     fun loadLocalProfileFromDiskWithDefault(filesDir: File, accountId: String): Single<VCard> =
         loadLocalProfileFromDisk(filesDir, accountId)
-            .onErrorReturn { setupDefaultProfile(filesDir, accountId) }
+            .onErrorReturn { defaultProfile(accountId) }
 
     /**
      * Loads the vcard file from the disk
@@ -197,20 +197,9 @@ object VCardUtils {
     private fun localProfilePath(filesDir: File, accountId: String): File =
         File(filesDir, accountId).apply { mkdir() }
 
-    private fun setupDefaultProfile(filesDir: File, accountId: String): VCard {
-        val vcard = VCard()
-        vcard.uid = Uid(accountId)
-        saveLocalProfileToDisk(vcard, accountId, filesDir)
-            .subscribeOn(Schedulers.io())
-            .subscribe({}) { e -> Log.e(TAG, "Error while saving vcard", e) }
-        return vcard
-    }
-
-    fun accountProfileReceived(filesDir: File, accountId: String, vcard: File): Single<VCard> =
-        Single.fromCallable { loadFromDisk(vcard)!! }
-            .subscribeOn(Schedulers.io())
+    private fun defaultProfile(accountId: String): VCard = VCard().apply { Uid(accountId) }
 
-    fun peerProfileReceived(filesDir: File, accountId: String, peerId: String, vcard: File): Single<VCard> =
+    fun loadProfile(vcard: File): Single<VCard> =
         Single.fromCallable { loadFromDisk(vcard)!! }
             .subscribeOn(Schedulers.io())