mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 00:12:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix compile error after lib merges

Browse source 
# Conflicts:
#	src/com/owncloud/android/ui/activity/ShareActivity.java
This commit is contained in:
AndyScherzinger 2016-11-22 21:57:26 +01:00
parent 448e977aca
commit e9b25d0a4a
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
View file

@ -43,7 +43,6 @@ import com.owncloud.android.operations.CreateShareViaLinkOperation;
import com.owncloud.android.operations.GetSharesForFileOperation; import com.owncloud.android.operations.GetSharesForFileOperation;
import com.owncloud.android.operations.UnshareOperation; import com.owncloud.android.operations.UnshareOperation;
import com.owncloud.android.operations.UpdateSharePermissionsOperation; import com.owncloud.android.operations.UpdateSharePermissionsOperation;
import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
import com.owncloud.android.ui.dialog.ShareLinkToDialog; import com.owncloud.android.ui.dialog.ShareLinkToDialog;
import com.owncloud.android.ui.fragment.EditShareFragment; import com.owncloud.android.ui.fragment.EditShareFragment;
import com.owncloud.android.ui.fragment.SearchShareesFragment; 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.ErrorMessageAdapter;
import com.owncloud.android.utils.GetShareWithUsersAsyncTask; import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
import org.nextcloud.providers.UsersAndGroupsSearchProvider;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
* Activity for sharing files * Activity for sharing files
*/ */