From e2621389aea5b080f54812ba6f74359a3ca0b62f Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Tue, 22 Nov 2016 21:57:26 +0100 Subject: [PATCH] fix compile error after lib merges # Conflicts: # src/com/owncloud/android/ui/activity/ShareActivity.java --- .../java/com/owncloud/android/ui/activity/ShareActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java b/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java index bc6d36c18f..20b7285586 100644 --- a/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java @@ -43,7 +43,6 @@ import com.owncloud.android.operations.CreateShareViaLinkOperation; import com.owncloud.android.operations.GetSharesForFileOperation; import com.owncloud.android.operations.UnshareOperation; import com.owncloud.android.operations.UpdateSharePermissionsOperation; -import com.owncloud.android.providers.UsersAndGroupsSearchProvider; import com.owncloud.android.ui.dialog.ShareLinkToDialog; import com.owncloud.android.ui.fragment.EditShareFragment; import com.owncloud.android.ui.fragment.SearchShareesFragment; @@ -52,8 +51,10 @@ import com.owncloud.android.ui.fragment.ShareFragmentListener; import com.owncloud.android.utils.ErrorMessageAdapter; import com.owncloud.android.utils.GetShareWithUsersAsyncTask; +import org.nextcloud.providers.UsersAndGroupsSearchProvider; import java.util.ArrayList; + /** * Activity for sharing files */