avoid creating Account object with empty name or type

tibbi · tibbi · commit c8dba03e71ef · 2018-05-13T21:37:43.000+02:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt
@@ -698,7 +698,9 @@ class ContactsHelper(val activity: Activity) {
             }
         }
 
-        val contentResolverAccounts = getContentResolverAccounts().filter { !accounts.contains(Account(it.name, it.type)) }
+        val contentResolverAccounts = getContentResolverAccounts().filter {
+            it.name.isNotEmpty() && it.type.isNotEmpty() && !accounts.contains(Account(it.name, it.type))
+        }
         sources.addAll(contentResolverAccounts)
 
         if (sources.isEmpty() && activity.config.localAccountName.isEmpty() && activity.config.localAccountType.isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,9 @@ class ContactsHelper(val activity: Activity) {`
`698`	`698`	`}`
`699`	`699`	`}`
`700`	`700`
`701`		`- val contentResolverAccounts = getContentResolverAccounts().filter { !accounts.contains(Account(it.name, it.type)) }`
	`701`	`+ val contentResolverAccounts = getContentResolverAccounts().filter {`
	`702`	`+ it.name.isNotEmpty() && it.type.isNotEmpty() && !accounts.contains(Account(it.name, it.type))`
	`703`	`+ }`
`702`	`704`	`sources.addAll(contentResolverAccounts)`
`703`	`705`
`704`	`706`	`if (sources.isEmpty() && activity.config.localAccountName.isEmpty() && activity.config.localAccountType.isEmpty()) {`