X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/20b0ec8977b845032214f31a9733aa8decd8cd07..080a8ab7af2bc48e3c5fa1334ae91d21073e26c2:/src/com/owncloud/android/ui/activity/ShareActivity.java diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java index 47709cbd..180b2a06 100644 --- a/src/com/owncloud/android/ui/activity/ShareActivity.java +++ b/src/com/owncloud/android/ui/activity/ShareActivity.java @@ -2,6 +2,7 @@ * ownCloud Android client application * * @author masensio + * @author David A. Velasco * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify @@ -20,147 +21,177 @@ package com.owncloud.android.ui.activity; -import android.accounts.Account; +import android.app.SearchManager; +import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import com.owncloud.android.R; +import com.owncloud.android.lib.common.utils.Log_OC; +import com.owncloud.android.providers.UsersAndGroupsSearchProvider; + +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.ui.dialog.LoadingDialog; -import com.owncloud.android.ui.fragment.SearchFragment; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.resources.shares.ShareType; +import com.owncloud.android.ui.fragment.SearchShareesFragment; import com.owncloud.android.ui.fragment.ShareFileFragment; +import com.owncloud.android.utils.GetShareWithUsersAsyncTask; + /** * Activity for sharing files */ -public class ShareActivity extends AppCompatActivity +public class ShareActivity extends FileActivity implements ShareFileFragment.OnShareFragmentInteractionListener, - SearchFragment.OnSearchFragmentInteractionListener { + SearchShareesFragment.OnSearchFragmentInteractionListener { + + private static final String TAG = ShareActivity.class.getSimpleName(); private static final String TAG_SHARE_FRAGMENT = "SHARE_FRAGMENT"; private static final String TAG_SEARCH_FRAGMENT = "SEARCH_USER_AND_GROUPS_FRAGMENT"; - private static final String DIALOG_WAIT_LOAD_DATA = "DIALOG_WAIT_LOAD_DATA"; - - private Account mAccount; - private OCFile mFile; - - private ShareFileFragment mShareFileFragment; - private SearchFragment mSearchFragment; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.share_activity); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - if (savedInstanceState != null) { - mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE); - mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT); - - mShareFileFragment = (ShareFileFragment) getSupportFragmentManager(). - getFragment(savedInstanceState, TAG_SHARE_FRAGMENT); - mSearchFragment = (SearchFragment) getSupportFragmentManager(). - getFragment(savedInstanceState, TAG_SEARCH_FRAGMENT); - - if (mShareFileFragment != null){ - ft.replace(R.id.share_fragment_container, mShareFileFragment, TAG_SHARE_FRAGMENT); - - if (mSearchFragment != null){ - ft.hide(mShareFileFragment); - ft.add(R.id.share_fragment_container, mSearchFragment, TAG_SEARCH_FRAGMENT); - ft.addToBackStack(TAG_SEARCH_FRAGMENT); - } - ft.commit(); - } + if (savedInstanceState == null) { + // Add Share fragment on first creation + Fragment fragment = ShareFileFragment.newInstance(getFile(), getAccount()); + ft.replace(R.id.share_fragment_container, fragment, TAG_SHARE_FRAGMENT); + ft.commit(); + } - } else { - // Read Extras - mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE); - mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT); + } - // Add Share fragment - mShareFileFragment = ShareFileFragment.newInstance(mFile, mAccount); - ft.replace(R.id.share_fragment_container, mShareFileFragment, TAG_SHARE_FRAGMENT); - ft.commit(); + protected void onAccountSet(boolean stateWasRecovered) { + super.onAccountSet(stateWasRecovered); - mSearchFragment = null; - } + // Load data into the list + Log_OC.d(TAG, "Refreshing lists on account set"); + refreshUsersInLists(); + // Request for a refresh of the data through the server (starts an Async Task) + refreshUsersOrGroupsListFromServer(); } + @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putParcelable(FileActivity.EXTRA_FILE, mFile); - outState.putParcelable(FileActivity.EXTRA_ACCOUNT, mAccount); - - //Save the fragment's instance - getSupportFragmentManager().putFragment(outState, TAG_SHARE_FRAGMENT, mShareFileFragment); - if (mSearchFragment != null) { - getSupportFragmentManager().putFragment(outState, TAG_SEARCH_FRAGMENT, mSearchFragment); + protected void onNewIntent(Intent intent) { + // Verify the action and get the query + if (Intent.ACTION_SEARCH.equals(intent.getAction())) { + String query = intent.getStringExtra(SearchManager.QUERY); + Log_OC.w(TAG, "Ignored Intent requesting to query for " + query); + + } else if (UsersAndGroupsSearchProvider.ACTION_SHARE_WITH.equals(intent.getAction())) { + Uri data = intent.getData(); + doShareWith( + data.getLastPathSegment(), + UsersAndGroupsSearchProvider.DATA_GROUP.equals(data.getAuthority()) + ); + + } else { + Log_OC.wtf(TAG, "Unexpected intent " + intent.toString()); } + } + private void doShareWith(String shareeName, boolean isGroup) { + getFileOperationsHelper().shareFileWithSharee( + getFile(), + shareeName, + (isGroup ? ShareType.GROUP : ShareType.USER) + ); } @Override public void showSearchUsersAndGroups() { + // replace ShareFragment with SearchFragment on demand FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - mSearchFragment = SearchFragment.newInstance(mFile, mAccount); - ft.hide(mShareFileFragment); - ft.add(R.id.share_fragment_container, mSearchFragment, TAG_SEARCH_FRAGMENT); - ft.addToBackStack(TAG_SEARCH_FRAGMENT); + Fragment searchFragment = SearchShareesFragment.newInstance(getFile(), getAccount()); + ft.replace(R.id.share_fragment_container, searchFragment, TAG_SEARCH_FRAGMENT); + ft.addToBackStack(null); // BACK button will recover the ShareFragment ft.commit(); } @Override - public void onBackPressed() { - super.onBackPressed(); - if (mSearchFragment != null){ - getSupportFragmentManager().popBackStackImmediate(); - mSearchFragment = null; - } + // Call to Unshare operation + public void unshareWith(OCShare share) { + OCFile file = getFile(); + getFileOperationsHelper().unshareFileWithUserOrGroup(file, share.getShareType(), share.getShareWith()); } + /** + * Get users and groups from the server to fill in the "share with" list + */ @Override - public void onShareFragmentInteraction(Uri uri) { - + public void refreshUsersOrGroupsListFromServer() { + // Show loading + showLoadingDialog(getString(R.string.common_loading)); + // Get Users and Groups + GetShareWithUsersAsyncTask getTask = new GetShareWithUsersAsyncTask(this); + Object[] params = {getFile(), getAccount(), getStorageManager()}; + getTask.execute(params); } + /** + * Updates the view associated to the activity after the finish of some operation over files + * in the current account. + * + * @param operation Removal operation performed. + * @param result Result of the removal. + */ @Override - public void onSearchFragmentInteraction(Uri uri) { + public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) { + super.onRemoteOperationFinish(operation, result); + + if (result.isSuccess()) { + Log_OC.d(TAG, "Refreshing lists on successful sync"); + refreshUsersInLists(); + } } - /** - * Show waiting for loading data - */ - public void showWaitingLoadDialog() { - // Construct dialog - LoadingDialog loading = new LoadingDialog( - getResources().getString(R.string.common_loading)); - FragmentManager fm = getSupportFragmentManager(); - FragmentTransaction ft = fm.beginTransaction(); - loading.show(ft, DIALOG_WAIT_LOAD_DATA); + private void refreshUsersInLists() { + ShareFileFragment shareFileFragment = getShareFileFragment(); + if (shareFileFragment != null) { // only if added to the view hierarchy!! + if (shareFileFragment.isAdded()) { + shareFileFragment.refreshUsersOrGroupsListFromDB(); + } + } + SearchShareesFragment searchShareesFragment = getSearchFragment(); + if (searchShareesFragment != null) { + if (searchShareesFragment.isAdded()) { // only if added to the view hierarchy!! + searchShareesFragment.refreshUsersOrGroupsListFromDB(); + } + } } + /** + * Shortcut to get access to the {@link ShareFileFragment} instance, if any + * + * @return A {@link ShareFileFragment} instance, or null + */ + private ShareFileFragment getShareFileFragment() { + return (ShareFileFragment) getSupportFragmentManager().findFragmentByTag(TAG_SHARE_FRAGMENT); + } /** - * Dismiss waiting for loading data + * Shortcut to get access to the {@link SearchShareesFragment} instance, if any + * + * @return A {@link SearchShareesFragment} instance, or null */ - public void dismissWaitingLoadDialog(){ - Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_LOAD_DATA); - if (frag != null) { - LoadingDialog loading = (LoadingDialog) frag; - loading.dismiss(); - } + private SearchShareesFragment getSearchFragment() { + return (SearchShareesFragment) getSupportFragmentManager().findFragmentByTag(TAG_SEARCH_FRAGMENT); } + }