[Android] Fix duplicated empty Organization fields in contacts

Adding empty organization data (company, department and title) to
contacts will show empty `Organization` filed in contacts and leads to
multiple empty Organization fields when the same contacts linked.

Fixed by adding `Organization` field only when there is valid data from
server.

Close #7607

app-android/app/src/main/java/de/tutao/tutanota/AndroidMobileContactsFacade.kt

@@ -339,6 +339,15 @@ class AndroidMobileContactsFacade(private val activity: MainActivity) : MobileCo
 		ContentResolver.setSyncAutomatically(tutaAccount, ContactsContract.AUTHORITY, false)
 	}
 
+	private fun hasDepartmentChanged(
+		storedContact: AndroidContact,
+		serverContact: StructuredContact
+	): Boolean {
+		// isNullOrEmpty check is required since department field is a nullableString, comparing the empty string with
+		// null value would fail.
+		return (storedContact.department != serverContact.department && !storedContact.department.isNullOrEmpty())
+	}
+
 	private fun checkContactDetails(
 		storedContact: AndroidContact,
 		serverContact: StructuredContact,
@@ -348,7 +357,11 @@ class AndroidMobileContactsFacade(private val activity: MainActivity) : MobileCo
 			checkContactBirthday(storedContact, ops, serverContact)
 		}
 
-		if (storedContact.company != serverContact.company || storedContact.role != serverContact.role || storedContact.department != serverContact.department) {
+		if (storedContact.company != serverContact.company || storedContact.role != serverContact.role || hasDepartmentChanged(
+				storedContact,
+				serverContact
+			)
+		) {
 			checkContactCompany(storedContact, ops, serverContact)
 		}
 
@@ -867,6 +880,8 @@ class AndroidMobileContactsFacade(private val activity: MainActivity) : MobileCo
 				).build()
 		)
 
+		// skip adding organization data if its empty to avoid duplicated organization field when linking contacts.
+		if (contact.role.isNotEmpty() || contact.company.isNotEmpty() || !contact.department.isNullOrEmpty()) {
 			ops.add(
 				ContentProviderOperation.newInsert(CONTACT_DATA_URI)
 					.withValueBackReference(RawContacts.Data.RAW_CONTACT_ID, index)
@@ -882,6 +897,7 @@ class AndroidMobileContactsFacade(private val activity: MainActivity) : MobileCo
 						ContactsContract.CommonDataKinds.Organization.TYPE_WORK
 					).build()
 			)
+		}
 
 		ops.add(
 			ContentProviderOperation.newInsert(CONTACT_DATA_URI)