* 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
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 android.widget.Toast;
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.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.operations.CreateShareWithShareeOperation;
+import com.owncloud.android.operations.UnshareOperation;
import com.owncloud.android.ui.fragment.SearchFragment;
import com.owncloud.android.ui.fragment.ShareFileFragment;
+import com.owncloud.android.utils.ErrorMessageAdapter;
+import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
+
+import java.util.ArrayList;
/**
* Activity for sharing files
*/
-public class ShareActivity extends AppCompatActivity
+public class ShareActivity extends FileActivity
implements ShareFileFragment.OnShareFragmentInteractionListener,
SearchFragment.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);
+ onAccountSet(false);
+
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);
if (mSearchFragment != null){
ft.hide(mShareFileFragment);
ft.add(R.id.share_fragment_container, mSearchFragment, TAG_SEARCH_FRAGMENT);
- ft.addToBackStack(TAG_SEARCH_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);
+ mShareFileFragment = ShareFileFragment.newInstance(getFile(), getAccount());
ft.replace(R.id.share_fragment_container, mShareFileFragment, TAG_SHARE_FRAGMENT);
ft.commit();
mSearchFragment = null;
}
+ handleIntent(getIntent());
+
+
+ }
+
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ setIntent(intent);
+ handleIntent(intent);
+ }
+
+
+ private void handleIntent(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
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) {
}
@Override
- public void showSearchUsersAndGroups() {
+ public void showSearchUsersAndGroups(ArrayList<OCShare> shares) {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
- mSearchFragment = SearchFragment.newInstance(mFile, mAccount);
+ mSearchFragment = SearchFragment.newInstance(getFile(), getAccount(), shares);
ft.hide(mShareFileFragment);
ft.add(R.id.share_fragment_container, mSearchFragment, TAG_SEARCH_FRAGMENT);
ft.addToBackStack(TAG_SEARCH_FRAGMENT);
}
@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);
}
@Override
- public void onSearchFragmentInteraction(Uri uri) {
-
+ public void onBackPressed() {
+ super.onBackPressed();
+ if (mSearchFragment != null){
+ mSearchFragment = null;
+ getSupportFragmentManager().popBackStackImmediate();
+ mShareFileFragment.refreshUsersOrGroupsListFromDB();
+ }
}
/**
- * Show waiting for loading data
+ * 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.
*/
- 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);
+ @Override
+ public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
+ super.onRemoteOperationFinish(operation, result);
+
+ if (result.isSuccess()) {
+ refreshUsersInLists();
+ if (operation instanceof CreateShareWithShareeOperation) {
+ // Clean action
+ getIntent().setAction(null);
+ }
+ }
}
-
- /**
- * Dismiss waiting for loading data
- */
- public void dismissWaitingLoadDialog(){
- Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_LOAD_DATA);
- if (frag != null) {
- LoadingDialog loading = (LoadingDialog) frag;
- loading.dismiss();
+ private void refreshUsersInLists(){
+ if (mShareFileFragment != null){
+ mShareFileFragment.refreshUsersOrGroupsListFromDB();
+ }
+ if (mSearchFragment != null) {
+ mSearchFragment.refreshUsersOrGroupsListFromDB();
}
}
+
}
projects / pub / Android / ownCloud.git / blobdiff