Merge pull request #3643 from owncloud/feature/user_list_sharing

Removed signed in user from the list of users for sharing

Author: abelgardep

CHANGELOG.md

@@ -11,6 +11,7 @@ Summary
 * Bugfix - Security flags for recording screen: [#3468](https://github.com/owncloud/android/issues/3468)
 * Bugfix - Crash when changing orientation in Details view: [#3571](https://github.com/owncloud/android/issues/3571)
 * Bugfix - Lock displays shown again: [#3591](https://github.com/owncloud/android/issues/3591)
+* Bugfix - Prevented signed in user in the list of users to be shared: [#1419](https://github.com/owncloud/android/issues/1419)
 * Enhancement - First steps in Android Enterprise integration: [#3415](https://github.com/owncloud/android/issues/3415)
 * Enhancement - Lock delay enforced: [#3440](https://github.com/owncloud/android/issues/3440)
 * Enhancement - Provide app feedback to MDM admins: [#3420](https://github.com/owncloud/android/issues/3420)
@@ -55,6 +56,14 @@ Details
    https://github.com/owncloud/android/issues/3591
    https://github.com/owncloud/android/pull/3592
 
+* Bugfix - Prevented signed in user in the list of users to be shared: [#1419](https://github.com/owncloud/android/issues/1419)
+
+   Previously, user list for sharing contains signed in user, now this user is omitted to avoid
+   errors.
+
+   https://github.com/owncloud/android/issues/1419
+   https://github.com/owncloud/android/pull/3643
+
 * Enhancement - First steps in Android Enterprise integration: [#3415](https://github.com/owncloud/android/issues/3415)
 
    Two parameters (server url and server url input visibility) can be now managed via MDM. These

changelog/unreleased/3643

@@ -0,0 +1,7 @@
+Bugfix: Prevented signed in user in the list of users to be shared
+
+Previously, user list for sharing contains signed in user,
+now this user is omitted to avoid errors.
+
+https://github.com/owncloud/android/issues/1419
+https://github.com/owncloud/android/pull/3643

owncloudApp/src/main/java/com/owncloud/android/presentation/providers/sharing/UsersAndGroupsSearchProvider.kt

@@ -24,6 +24,7 @@
 
 package com.owncloud.android.presentation.providers.sharing
 
+import android.accounts.AccountManager
 import android.app.SearchManager
 import android.content.ContentProvider
 import android.content.ContentValues
@@ -43,10 +44,10 @@ import com.owncloud.android.domain.sharing.sharees.GetShareesAsyncUseCase
 import com.owncloud.android.domain.sharing.sharees.model.OCSharee
 import com.owncloud.android.domain.sharing.shares.model.ShareType
 import com.owncloud.android.extensions.parseError
+import com.owncloud.android.lib.common.accounts.AccountUtils.Constants.KEY_DISPLAY_NAME
 import org.json.JSONException
 import org.koin.android.ext.android.inject
 import timber.log.Timber
-import java.util.HashMap
 import java.util.Locale
 
 /**
@@ -178,8 +179,13 @@ class UsersAndGroupsSearchProvider : ContentProvider() {
             val federatedShareAllowed = capabilities?.filesSharingFederationOutgoing?.isTrue ?: false
 
             try {
+                val userName = AccountUtils.getUsernameOfAccount(account.name)
+                val fullName = AccountManager.get(context).getUserData(account, KEY_DISPLAY_NAME)
                 while (namesIt.hasNext()) {
                     item = namesIt.next()
+                    if (item.label == userName || item.label == fullName && item.shareType == ShareType.USER) {
+                        continue
+                    }
                     var userName = item.label
                     val type = item.shareType
                     val shareWith = item.shareWith