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

Merge pull request #204 from owncloud/check_account_existance_in_gallery

Browse source 
Check account existance when entering in the app through an activity showing preview or details of a file.
This commit is contained in:
masensio 2013-07-03 03:38:16 -07:00
commit 50bf276b58
13 changed files with 549 additions and 545 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -95,7 +95,7 @@
<activity android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
android:theme="@style/Theme.ownCloud.Fullscreen" >
</activity>
<service

4
res/layout/video_layout.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_width="match_parent"
android:layout_height="match_parent" >
<VideoView android:id="@+id/videoPlayer"
android:layout_width="wrap_content"

12
res/values/styles.xml
View file

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Animations" />
<!-- Default ownCloud app style -->
@ -29,9 +29,15 @@
<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
</style>
</style>
<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:windowFullscreen">true</item>
</style>
<style name="Theme.ownCloud.Widget.ActionBar" parent="style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<item name="android:background">@drawable/main_header_bg</item>
<item name="background">@drawable/main_header_bg</item>

58
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
View file

@ -18,15 +18,15 @@
package com.owncloud.android.ui.activity;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.Log_OC;
import com.owncloud.android.datamodel.DataStorageManager;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
import android.accounts.Account;
import android.content.Intent;
import android.os.Bundle;
@ -35,32 +35,15 @@ import android.os.Bundle;
* application.
*
* @author Bartek Przybylski
*
* @author David A. Velasco
*/
public class ConflictsResolveActivity extends SherlockFragmentActivity implements OnConflictDecisionMadeListener {
public static final String EXTRA_FILE = "FILE";
public static final String EXTRA_ACCOUNT = "ACCOUNT";
public class ConflictsResolveActivity extends FileActivity implements OnConflictDecisionMadeListener {
private String TAG = ConflictsResolveActivity.class.getSimpleName();
//private String mRemotePath;
//private String mLocalPath;
private OCFile mFile;
private Account mOCAccount;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//mRemotePath = getIntent().getStringExtra("remotepath");
//mLocalPath = getIntent().getStringExtra("localpath");
mFile = getIntent().getParcelableExtra(EXTRA_FILE);
mOCAccount = getIntent().getParcelableExtra(EXTRA_ACCOUNT);
ConflictsResolveDialog d = ConflictsResolveDialog.newInstance(mFile.getRemotePath(), this);
d.showDialog(this);
}
@Override
@ -81,11 +64,40 @@ public class ConflictsResolveActivity extends SherlockFragmentActivity implement
Log_OC.wtf(TAG, "Unhandled conflict decision " + decision);
return;
}
i.putExtra(FileUploader.KEY_ACCOUNT, mOCAccount);
i.putExtra(FileUploader.KEY_FILE, mFile);
i.putExtra(FileUploader.KEY_ACCOUNT, getAccount());
i.putExtra(FileUploader.KEY_FILE, getFile());
i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
startService(i);
finish();
}
@Override
protected void onAccountSet(boolean stateWasRecovered) {
if (getAccount() != null) {
OCFile file = getFile();
if (getFile() == null) {
Log_OC.e(TAG, "No conflictive file received");
finish();
} else {
/// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
DataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
file = storageManager.getFileByPath(file.getRemotePath()); // file = null if not in the current Account
if (file != null) {
setFile(file);
ConflictsResolveDialog d = ConflictsResolveDialog.newInstance(file.getRemotePath(), this);
d.showDialog(this);
} else {
// account was changed to a different one - just finish
finish();
}
}
} else {
Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
finish();
}
}
}

117
src/com/owncloud/android/ui/activity/FileActivity.java
View file

@ -60,9 +60,15 @@ public abstract class FileActivity extends SherlockFragmentActivity {
/** Flag to signal that the activity will is finishing to enforce the creation of an ownCloud {@link Account} */
private boolean mRedirectingToSetupAccount = false;
/** Flag to signal when the value of mAccount was set */
private boolean mAccountWasSet;
/** Flag to signal when the value of mAccount was restored from a saved state */
private boolean mAccountWasRestored;
/**
* Loads the cownCloud {@link Account} and main {@link OCFile} to be handled by the instance of
* Loads the ownCloud {@link Account} and main {@link OCFile} to be handled by the instance of
* the {@link FileActivity}.
*
* Grants that a valid ownCloud {@link Account} is associated to the instance, or that the user
@ -72,18 +78,16 @@ public abstract class FileActivity extends SherlockFragmentActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Account account;
if(savedInstanceState != null) {
account = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
} else {
mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
account = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
}
grantValidAccount();
if (mAccount != null) {
onAccountSet(savedInstanceState != null);
}
setAccount(account, savedInstanceState != null);
}
@ -95,37 +99,75 @@ public abstract class FileActivity extends SherlockFragmentActivity {
@Override
protected void onRestart() {
super.onRestart();
Account oldAccount = mAccount;
grantValidAccount();
if (mAccount != null && !mAccount.equals(oldAccount)) {
onAccountSet(false);
}
}
/**
* Validates the ownCloud {@link Account} associated to the Activity any time it is restarted.
*
* If not valid, tries to swap it for other valid and existing ownCloud {@link Account}.
*
* If no valid ownCloud {@link Account} exists, mAccount is set to NULL and the user is requested
* to create a new ownCloud {@link Account}.
*/
private void grantValidAccount() {
boolean validAccount = (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name));
if (!validAccount) {
// get most recently used account as default account
mAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
if (mAccount == null) {
/// no account available: force account creation
createFirstAccount();
mRedirectingToSetupAccount = true;
}
swapToDefaultAccount();
}
}
@Override
protected void onStart() {
super.onStart();
if (mAccountWasSet) {
onAccountSet(mAccountWasRestored);
}
}
/**
* Sets and validates the ownCloud {@link Account} associated to the Activity.
*
* If not valid, tries to swap it for other valid and existing ownCloud {@link Account}.
*
* POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}.
*
* @param account New {@link Account} to set.
* @param savedAccount When 'true', account was retrieved from a saved instance state.
*/
private void setAccount(Account account, boolean savedAccount) {
Account oldAccount = mAccount;
boolean validAccount = (account != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), account.name));
if (validAccount) {
mAccount = account;
mAccountWasSet = true;
mAccountWasRestored = (savedAccount || mAccount.equals(oldAccount));
} else {
swapToDefaultAccount();
}
}
/**
* Tries to swap the current ownCloud {@link Account} for other valid and existing.
*
* If no valid ownCloud {@link Account} exists, the the user is requested
* to create a new ownCloud {@link Account}.
*
* POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}.
*
* @return 'True' if the checked {@link Account} was valid.
*/
private void swapToDefaultAccount() {
// default to the most recently used account
Account newAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
if (newAccount == null) {
/// no account available: force account creation
createFirstAccount();
mRedirectingToSetupAccount = true;
mAccountWasSet = false;
mAccountWasRestored = false;
} else {
mAccountWasSet = true;
mAccountWasRestored = (newAccount.equals(mAccount));
mAccount = newAccount;
}
}
/**
* Launches the account creation activity. To use when no ownCloud account is available
*/
@ -203,6 +245,7 @@ public abstract class FileActivity extends SherlockFragmentActivity {
@Override
public void run(AccountManagerFuture<Bundle> future) {
FileActivity.this.mRedirectingToSetupAccount = false;
boolean accountWasSet = false;
if (future != null) {
try {
Bundle result;
@ -210,11 +253,11 @@ public abstract class FileActivity extends SherlockFragmentActivity {
String name = result.getString(AccountManager.KEY_ACCOUNT_NAME);
String type = result.getString(AccountManager.KEY_ACCOUNT_TYPE);
if (AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), name)) {
FileActivity.this.mAccount = new Account(name, type);
FileActivity.this.onAccountSet(false);
setAccount(new Account(name, type), false);
accountWasSet = true;
}
} catch (OperationCanceledException e) {
Log_OC.e(TAG, "Account creation canceled");
Log_OC.d(TAG, "Account creation canceled");
} catch (Exception e) {
Log_OC.e(TAG, "Account creation finished in exception: ", e);
@ -223,8 +266,8 @@ public abstract class FileActivity extends SherlockFragmentActivity {
} else {
Log_OC.e(TAG, "Account creation callback with null bundle");
}
if (mAccount == null) {
finish();
if (!accountWasSet) {
moveTaskToBack(true);
}
}

97
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -137,9 +137,9 @@ public class FileDisplayActivity extends FileActivity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreate() start");
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
super.onCreate(savedInstanceState);
super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
mHandler = new Handler();
@ -176,26 +176,12 @@ public class FileDisplayActivity extends FileActivity implements
mRightFragmentContainer = findViewById(R.id.right_fragment_container);
if (savedInstanceState == null) {
createMinFragments();
if (!isRedirectingToSetupAccount()) {
initFragmentsWithFile();
}
}
// Action bar setup
mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
OCFile currFile = getFile();
if (mStorageManager != null) {
while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
if (currFile.isDirectory()) {
mDirectories.add(currFile.getFileName());
}
currFile = mStorageManager.getFileById(currFile.getParentId());
}
}
mDirectories.add(OCFile.PATH_SEPARATOR);
ActionBar actionBar = getSupportActionBar();
actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to workaround bug in its implementation
getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to work around bug in its implementation
Log_OC.d(TAG, "onCreate() end");
}
@ -233,17 +219,28 @@ public class FileDisplayActivity extends FileActivity implements
}
if (file == null) {
// fall back to root folder
file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); // never should return null
file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); // never returns null
}
setFile(file);
if (findViewById(android.R.id.content) != null && !stateWasRecovered) {
mDirectories.clear();
OCFile fileIt = file;
while(fileIt != null && fileIt.getFileName() != OCFile.PATH_SEPARATOR) {
if (fileIt.isDirectory()) {
mDirectories.add(fileIt.getFileName());
}
fileIt = mStorageManager.getFileById(fileIt.getParentId());
}
mDirectories.add(OCFile.PATH_SEPARATOR);
if (!stateWasRecovered) {
Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
initFragmentsWithFile();
} else {
Log_OC.e(TAG, "Fragment initializacion ignored in onAccountChanged due to lack of CONTENT VIEW");
updateFragmentsVisibility(!file.isDirectory());
updateNavigationElementsInActionBar(file.isDirectory() ? null : file);
}
} else {
Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
}
@ -259,11 +256,24 @@ public class FileDisplayActivity extends FileActivity implements
private void initFragmentsWithFile() {
if (getAccount() != null && getFile() != null) {
/// First fragment
OCFileListFragment listOfFiles = getListOfFilesFragment();
if (listOfFiles != null) {
listOfFiles.listDirectory(getCurrentDir());
} else {
Log.e(TAG, "Still have a chance to lose the initializacion of list fragment >(");
}
/// Second fragment
OCFile file = getFile();
Fragment secondFragment = chooseInitialSecondFragment(file);
if (secondFragment != null) {
setSecondFragment(secondFragment);
updateFragmentsVisibility(true);
updateNavigationElementsInActionBar(file);
} else {
cleanSecondFragment();
}
} else {
@ -361,8 +371,9 @@ public class FileDisplayActivity extends FileActivity implements
FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
tr.remove(second);
tr.commit();
updateFragmentsVisibility(false);
}
updateFragmentsVisibility(false);
updateNavigationElementsInActionBar(null);
}
protected void refeshListOfFilesFragment() {
@ -587,7 +598,6 @@ public class FileDisplayActivity extends FileActivity implements
setFile(listOfFiles.getCurrentFile());
}
cleanSecondFragment();
updateNavigationElementsInActionBar(null);
}
@Override
@ -598,14 +608,7 @@ public class FileDisplayActivity extends FileActivity implements
outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
Log_OC.d(TAG, "onSaveInstanceState() end");
}
@Override
protected void onStart() {
super.onStart();
FileFragment second = getSecondFragment();
updateFragmentsVisibility(second != null);
updateNavigationElementsInActionBar((second == null) ? null : second.getFile());
}
@Override
protected void onResume() {
@ -628,12 +631,6 @@ public class FileDisplayActivity extends FileActivity implements
mDownloadFinishReceiver = new DownloadFinishReceiver();
registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
// List current directory
OCFileListFragment listOfFiles = getListOfFilesFragment();
if (listOfFiles != null) {
listOfFiles.listDirectory(getCurrentDir()); // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)
}
Log_OC.d(TAG, "onResume() end");
}
@ -848,8 +845,9 @@ public class FileDisplayActivity extends FileActivity implements
if (fileListFragment != null) {
fileListFragment.listDirectory(currentDir);
}
if (getSecondFragment() == null)
setFile(currentDir);
}
setFile(currentDir);
setSupportProgressBarIndeterminateVisibility(inProgress);
removeStickyBroadcast(intent);
@ -939,7 +937,6 @@ public class FileDisplayActivity extends FileActivity implements
public void onBrowsedDownTo(OCFile directory) {
pushDirname(directory);
cleanSecondFragment();
updateNavigationElementsInActionBar(null);
}
/**
@ -1009,9 +1006,9 @@ public class FileDisplayActivity extends FileActivity implements
/**
* TODO
*/
private void updateNavigationElementsInActionBar(OCFile currentFile) {
private void updateNavigationElementsInActionBar(OCFile chosenFile) {
ActionBar actionBar = getSupportActionBar();
if (currentFile == null || mDualPane) {
if (chosenFile == null || mDualPane) {
// only list of files - set for browsing through folders
OCFile currentDir = getCurrentDir();
actionBar.setDisplayHomeAsUpEnabled(currentDir != null && currentDir.getParentId() != 0);
@ -1022,21 +1019,12 @@ public class FileDisplayActivity extends FileActivity implements
} else {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setTitle(currentFile.getFileName());
actionBar.setTitle(chosenFile.getFileName());
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
}
}
/**
* {@inheritDoc}
*/
@Override
public OCFile getInitialDirectory() {
return getCurrentDir();
}
/**
* {@inheritDoc}
*/
@ -1339,12 +1327,11 @@ public class FileDisplayActivity extends FileActivity implements
if (file != null) {
if (file.isDirectory()) {
return file;
} else {
} else if (mStorageManager != null) {
return mStorageManager.getFileById(file.getParentId());
}
} else {
return null;
}
return null;
}
}

26
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -34,7 +34,6 @@ import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
@ -53,7 +52,7 @@ import com.owncloud.android.R;
*
*/
public class UploadFilesActivity extends SherlockFragmentActivity implements
public class UploadFilesActivity extends FileActivity implements
LocalFileListFragment.ContainerActivity, OnNavigationListener, OnClickListener, ConfirmationDialogFragmentListener {
private ArrayAdapter<String> mDirectories;
@ -61,10 +60,9 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
private LocalFileListFragment mFileListFragment;
private Button mCancelBtn;
private Button mUploadBtn;
private Account mAccount;
private Account mAccountOnCreation;
private DialogFragment mCurrentDialog;
public static final String EXTRA_ACCOUNT = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_ACCOUNT";
public static final String EXTRA_CHOSEN_FILES = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CHOSEN_FILES";
public static final int RESULT_OK_AND_MOVE = RESULT_FIRST_USER;
@ -86,7 +84,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
mCurrentDir = Environment.getExternalStorageDirectory();
}
mAccount = getIntent().getParcelableExtra(EXTRA_ACCOUNT);
mAccountOnCreation = getAccount();
/// USER INTERFACE
@ -318,7 +316,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
File localFile = new File(localPath);
total += localFile.length();
}
return (FileStorageUtils.getUsableSpace(mAccount.name) >= total);
return (FileStorageUtils.getUsableSpace(mAccountOnCreation.name) >= total);
}
/**
@ -374,6 +372,22 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
public void onCancel(String callerTag) {
/// nothing to do; don't finish, let the user change the selection
Log_OC.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag);
}
@Override
protected void onAccountSet(boolean stateWasRecovered) {
if (getAccount() != null) {
if (!mAccountOnCreation.equals(getAccount())) {
setResult(RESULT_CANCELED);
finish();
}
} else {
Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
setResult(RESULT_CANCELED);
finish();
}
}

515
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
View file

@ -1,260 +1,255 @@
/* ownCloud Android client application
* Copyright (C) 2011 Bartek Przybylski
* Copyright (C) 2012-2013 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.owncloud.android.ui.adapter;
import java.util.Vector;
import android.accounts.Account;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import com.owncloud.android.DisplayUtils;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.DataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.ui.activity.TransferServiceGetter;
/**
* This Adapter populates a ListView with all files and folders in an ownCloud
* instance.
*
* @author Bartek Przybylski
*
*/
public class FileListListAdapter extends BaseAdapter implements ListAdapter {
private Context mContext;
private OCFile mFile = null;
private Vector<OCFile> mFiles = null;
private DataStorageManager mStorageManager;
private Account mAccount;
private TransferServiceGetter mTransferServiceGetter;
//total size of a directory (recursive)
private Long totalSizeOfDirectoriesRecursive = null;
private Long lastModifiedOfAllSubdirectories = null;
public FileListListAdapter(OCFile file, DataStorageManager storage_man,
Context context, TransferServiceGetter transferServiceGetter) {
mStorageManager = storage_man;
mContext = context;
mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
mTransferServiceGetter = transferServiceGetter;
swapDirectory(file, mStorageManager);
/*mFile = file;
mFiles = mStorageManager.getDirectoryContent(mFile);*/
}
@Override
public boolean areAllItemsEnabled() {
return true;
}
@Override
public boolean isEnabled(int position) {
return true;
}
@Override
public int getCount() {
return mFiles != null ? mFiles.size() : 0;
}
@Override
public Object getItem(int position) {
if (mFiles == null || mFiles.size() <= position)
return null;
return mFiles.get(position);
}
@Override
public long getItemId(int position) {
if (mFiles == null || mFiles.size() <= position)
return 0;
return mFiles.get(position).getFileId();
}
@Override
public int getItemViewType(int position) {
return 0;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = convertView;
if (view == null) {
LayoutInflater inflator = (LayoutInflater) mContext
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = inflator.inflate(R.layout.list_item, null);
}
if (mFiles != null && mFiles.size() > position) {
OCFile file = mFiles.get(position);
TextView fileName = (TextView) view.findViewById(R.id.Filename);
String name = file.getFileName();
fileName.setText(name);
ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype()));
ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
localStateView.setImageResource(R.drawable.downloading_file_indicator);
localStateView.setVisibility(View.VISIBLE);
} else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {
localStateView.setImageResource(R.drawable.uploading_file_indicator);
localStateView.setVisibility(View.VISIBLE);
} else if (file.isDown()) {
localStateView.setImageResource(R.drawable.local_file_indicator);
localStateView.setVisibility(View.VISIBLE);
} else {
localStateView.setVisibility(View.INVISIBLE);
}
TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
if (!file.isDirectory()) {
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
lastModV.setVisibility(View.VISIBLE);
lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));
// this if-else is needed even thoe fav icon is visible by default
// because android reuses views in listview
if (!file.keepInSync()) {
view.findViewById(R.id.imageView3).setVisibility(View.GONE);
} else {
view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);
}
ListView parentList = (ListView)parent;
if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) {
checkBoxV.setVisibility(View.GONE);
} else {
if (parentList.isItemChecked(position)) {
checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);
} else {
checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);
}
checkBoxV.setVisibility(View.VISIBLE);
}
}
else {
getDirectorySizeNumber(file,true);
if (lastModifiedOfAllSubdirectories == null)
{
lastModV.setVisibility(View.GONE);
fileSizeV.setVisibility(View.GONE);
}
else
{
lastModV.setVisibility(View.VISIBLE);
lastModV.setText(DisplayUtils.unixTimeToHumanReadable(lastModifiedOfAllSubdirectories));
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable((totalSizeOfDirectoriesRecursive == null) ? 0 : totalSizeOfDirectoriesRecursive));
}
checkBoxV.setVisibility(View.GONE);
view.findViewById(R.id.imageView3).setVisibility(View.GONE);
}
}
return view;
}
/**
* - This method counts recursively all subdirectories and their files from the root directory.
* - It also shows a timestamp of the last modificated file inside the root directory
*
* @param OCFile : startDirectory
* @param boolean : counting starts from here ?
*/
private void getDirectorySizeNumber(OCFile directory,boolean startOfRecursive) {
if (startOfRecursive) {
totalSizeOfDirectoriesRecursive = null;
}
Vector<OCFile> files = mStorageManager.getDirectoryContent(directory);
for (OCFile file : files) {
if(!file.isDirectory()) {
if (totalSizeOfDirectoriesRecursive == null) {
totalSizeOfDirectoriesRecursive = file.getFileLength();
lastModifiedOfAllSubdirectories = file.getModificationTimestamp();
continue;
}
totalSizeOfDirectoriesRecursive += file.getFileLength();
if (lastModifiedOfAllSubdirectories < file.getModificationTimestamp()) {
lastModifiedOfAllSubdirectories = file.getModificationTimestamp();
}
}
else {
this.getDirectorySizeNumber(file, false);
}
}
}
@Override
public int getViewTypeCount() {
return 1;
}
@Override
public boolean hasStableIds() {
return true;
}
@Override
public boolean isEmpty() {
return (mFiles == null || mFiles.isEmpty());
}
/**
* Change the adapted directory for a new one
* @param directory New file to adapt. Can be NULL, meaning "no content to adapt".
* @param updatedStorageManager Optional updated storage manager; used to replace mStorageManager if is different (and not NULL)
*/
public void swapDirectory(OCFile directory, DataStorageManager updatedStorageManager) {
mFile = directory;
if (updatedStorageManager != null && updatedStorageManager != mStorageManager) {
mStorageManager = updatedStorageManager;
mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
}
if (mStorageManager != null) {
mFiles = mStorageManager.getDirectoryContent(mFile);
} else {
mFiles = null;
}
notifyDataSetChanged();
}
}
/* ownCloud Android client application
* Copyright (C) 2011 Bartek Przybylski
* Copyright (C) 2012-2013 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.owncloud.android.ui.adapter;
import android.accounts.Account;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import com.owncloud.android.DisplayUtils;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.DataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.ui.activity.TransferServiceGetter;
import java.util.Vector;
/**
* This Adapter populates a ListView with all files and folders in an ownCloud
* instance.
*
* @author Bartek Przybylski
*
*/
public class FileListListAdapter extends BaseAdapter implements ListAdapter {
private Context mContext;
private OCFile mFile = null;
private Vector<OCFile> mFiles = null;
private DataStorageManager mStorageManager;
private Account mAccount;
private TransferServiceGetter mTransferServiceGetter;
//total size of a directory (recursive)
private Long totalSizeOfDirectoriesRecursive = null;
private Long lastModifiedOfAllSubdirectories = null;
public FileListListAdapter(Context context, TransferServiceGetter transferServiceGetter) {
mContext = context;
mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
mTransferServiceGetter = transferServiceGetter;
}
@Override
public boolean areAllItemsEnabled() {
return true;
}
@Override
public boolean isEnabled(int position) {
return true;
}
@Override
public int getCount() {
return mFiles != null ? mFiles.size() : 0;
}
@Override
public Object getItem(int position) {
if (mFiles == null || mFiles.size() <= position)
return null;
return mFiles.get(position);
}
@Override
public long getItemId(int position) {
if (mFiles == null || mFiles.size() <= position)
return 0;
return mFiles.get(position).getFileId();
}
@Override
public int getItemViewType(int position) {
return 0;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = convertView;
if (view == null) {
LayoutInflater inflator = (LayoutInflater) mContext
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = inflator.inflate(R.layout.list_item, null);
}
if (mFiles != null && mFiles.size() > position) {
OCFile file = mFiles.get(position);
TextView fileName = (TextView) view.findViewById(R.id.Filename);
String name = file.getFileName();
fileName.setText(name);
ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype()));
ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
localStateView.setImageResource(R.drawable.downloading_file_indicator);
localStateView.setVisibility(View.VISIBLE);
} else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {
localStateView.setImageResource(R.drawable.uploading_file_indicator);
localStateView.setVisibility(View.VISIBLE);
} else if (file.isDown()) {
localStateView.setImageResource(R.drawable.local_file_indicator);
localStateView.setVisibility(View.VISIBLE);
} else {
localStateView.setVisibility(View.INVISIBLE);
}
TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
if (!file.isDirectory()) {
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
lastModV.setVisibility(View.VISIBLE);
lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));
// this if-else is needed even thoe fav icon is visible by default
// because android reuses views in listview
if (!file.keepInSync()) {
view.findViewById(R.id.imageView3).setVisibility(View.GONE);
} else {
view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);
}
ListView parentList = (ListView)parent;
if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) {
checkBoxV.setVisibility(View.GONE);
} else {
if (parentList.isItemChecked(position)) {
checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);
} else {
checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);
}
checkBoxV.setVisibility(View.VISIBLE);
}
}
else {
getDirectorySizeNumber(file,true);
if (lastModifiedOfAllSubdirectories == null)
{
lastModV.setVisibility(View.GONE);
fileSizeV.setVisibility(View.GONE);
}
else
{
lastModV.setVisibility(View.VISIBLE);
lastModV.setText(DisplayUtils.unixTimeToHumanReadable(lastModifiedOfAllSubdirectories));
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable((totalSizeOfDirectoriesRecursive == null) ? 0 : totalSizeOfDirectoriesRecursive));
}
checkBoxV.setVisibility(View.GONE);
view.findViewById(R.id.imageView3).setVisibility(View.GONE);
}
}
return view;
}
/**
* - This method counts recursively all subdirectories and their files from the root directory.
* - It also shows a timestamp of the last modificated file inside the root directory
*
* @param OCFile : startDirectory
* @param boolean : counting starts from here ?
*/
private void getDirectorySizeNumber(OCFile directory,boolean startOfRecursive) {
if (startOfRecursive) {
totalSizeOfDirectoriesRecursive = null;
}
Vector<OCFile> files = mStorageManager.getDirectoryContent(directory);
for (OCFile file : files) {
if(!file.isDirectory()) {
if (totalSizeOfDirectoriesRecursive == null) {
totalSizeOfDirectoriesRecursive = file.getFileLength();
lastModifiedOfAllSubdirectories = file.getModificationTimestamp();
continue;
}
totalSizeOfDirectoriesRecursive += file.getFileLength();
if (lastModifiedOfAllSubdirectories < file.getModificationTimestamp()) {
lastModifiedOfAllSubdirectories = file.getModificationTimestamp();
}
}
else {
this.getDirectorySizeNumber(file, false);
}
}
}
@Override
public int getViewTypeCount() {
return 1;
}
@Override
public boolean hasStableIds() {
return true;
}
@Override
public boolean isEmpty() {
return (mFiles == null || mFiles.isEmpty());
}
/**
* Change the adapted directory for a new one
* @param directory New file to adapt. Can be NULL, meaning "no content to adapt".
* @param updatedStorageManager Optional updated storage manager; used to replace mStorageManager if is different (and not NULL)
*/
public void swapDirectory(OCFile directory, DataStorageManager updatedStorageManager) {
mFile = directory;
if (updatedStorageManager != null && updatedStorageManager != mStorageManager) {
mStorageManager = updatedStorageManager;
mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
}
if (mStorageManager != null) {
mFiles = mStorageManager.getDirectoryContent(mFile);
} else {
mFiles = null;
}
notifyDataSetChanged();
}
}

26
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -63,6 +63,9 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
public class OCFileListFragment extends ExtendedListFragment implements EditNameDialogListener, ConfirmationDialogFragmentListener {
private static final String TAG = OCFileListFragment.class.getSimpleName();
private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class.getPackage().getName() : "com.owncloud.android.ui.fragment";
private static final String EXTRA_FILE = MY_PACKAGE + ".extra.FILE";
private OCFileListFragment.ContainerActivity mContainerActivity;
@ -94,7 +97,10 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
Log_OC.e(TAG, "onActivityCreated() start");
mAdapter = new FileListListAdapter(mContainerActivity.getInitialDirectory(), mContainerActivity.getStorageManager(), getActivity(), mContainerActivity);
mAdapter = new FileListListAdapter(getActivity(), mContainerActivity);
if (savedInstanceState != null) {
mFile = savedInstanceState.getParcelable(EXTRA_FILE);
}
setListAdapter(mAdapter);
registerForContextMenu(getListView());
@ -103,6 +109,15 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
mHandler = new Handler();
}
/**
* Saves the current listed folder.
*/
@Override
public void onSaveInstanceState (Bundle outState) {
super.onSaveInstanceState(outState);
outState.putParcelable(EXTRA_FILE, mFile);
}
/**
* Call this, when the user presses the up button
@ -124,7 +139,6 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
if (file != null) {
if (file.isDirectory()) {
// update state and view of this fragment
mFile = file;
listDirectory(file);
// then, notify parent activity to let it update its state and view, and other fragments
mContainerActivity.onBrowsedDownTo(file);
@ -387,14 +401,6 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
public DataStorageManager getStorageManager();
/**
* Callback method invoked when the parent activity is fully created to get the directory to list firstly.
*
* @return Directory to list firstly. Can be NULL.
*/
public OCFile getInitialDirectory();
/**
* Callback method invoked when a the 'transfer state' of a file changes.
*

79
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
View file

@ -16,7 +16,6 @@
*/
package com.owncloud.android.ui.preview;
import android.accounts.Account;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.BroadcastReceiver;
@ -33,7 +32,6 @@ import android.view.View;
import android.view.View.OnTouchListener;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window;
import com.owncloud.android.authentication.AccountUtils;
@ -52,7 +50,7 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
/**
* Used as an utility to preview image files contained in an ownCloud account.
* Holds a swiping galley where image files contained in an ownCloud directory are shown
*
* @author David A. Velasco
*/
@ -65,9 +63,6 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
public static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
private static final String KEY_WAITING_FOR_BINDER = "WAITING_FOR_BINDER";
private OCFile mFile;
private OCFile mParentFolder;
private Account mAccount;
private DataStorageManager mStorageManager;
private ViewPager mViewPager;
@ -88,53 +83,35 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
if (mFile == null) {
throw new IllegalStateException("Instanced with a NULL OCFile");
}
if (mAccount == null) {
throw new IllegalStateException("Instanced with a NULL ownCloud Account");
}
if (!mFile.isImage()) {
throw new IllegalArgumentException("Non-image file passed as argument");
}
requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
setContentView(R.layout.preview_image_activity);
ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setTitle(mFile.getFileName());
actionBar.hide();
mFullScreen = true;
mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
mParentFolder = mStorageManager.getFileById(mFile.getParentId());
if (mParentFolder == null) {
// should not be necessary
mParentFolder = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
}
if (savedInstanceState != null) {
mRequestWaitingForBinder = savedInstanceState.getBoolean(KEY_WAITING_FOR_BINDER);
} else {
mRequestWaitingForBinder = false;
}
createViewPager();
}
private void createViewPager() {
mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), mParentFolder, mAccount, mStorageManager);
private void initViewPager() {
OCFile parentFolder = mStorageManager.getFileById(getFile().getParentId());
if (parentFolder == null) {
// should not be necessary
parentFolder = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
}
mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), parentFolder, getAccount(), mStorageManager);
mViewPager = (ViewPager) findViewById(R.id.fragmentPager);
int position = mPreviewImagePagerAdapter.getFilePosition(mFile);
int position = mPreviewImagePagerAdapter.getFilePosition(getFile());
position = (position >= 0) ? position : 0;
mViewPager.setAdapter(mPreviewImagePagerAdapter);
mViewPager.setOnPageChangeListener(this);
mViewPager.setCurrentItem(position);
if (position == 0 && !mFile.isDown()) {
if (position == 0 && !getFile().isDown()) {
// this is necessary because mViewPager.setCurrentItem(0) just after setting the adapter does not result in a call to #onPageSelected(0)
mRequestWaitingForBinder = true;
}
@ -320,9 +297,9 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
if (mDownloaderBinder == null) {
Log_OC.d(TAG, "requestForDownload called without binder to download service");
} else if (!mDownloaderBinder.isDownloading(mAccount, file)) {
} else if (!mDownloaderBinder.isDownloading(getAccount(), file)) {
Intent i = new Intent(this, FileDownloader.class);
i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);
i.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());
i.putExtra(FileDownloader.EXTRA_FILE, file);
startService(i);
}
@ -385,7 +362,7 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
public void onReceive(Context context, Intent intent) {
String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
if (mAccount.name.equals(accountName) &&
if (getAccount().name.equals(accountName) &&
downloadedRemotePath != null) {
OCFile file = mStorageManager.getFileByPath(downloadedRemotePath);
@ -436,7 +413,33 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
@Override
protected void onAccountSet(boolean stateWasRecovered) {
// TODO
if (getAccount() != null) {
OCFile file = getFile();
/// Validate handled file (first image to preview)
if (file == null) {
throw new IllegalStateException("Instanced with a NULL OCFile");
}
if (!file.isImage()) {
throw new IllegalArgumentException("Non-image file passed as argument");
}
mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver());
file = mStorageManager.getFileById(file.getFileId());
if (file != null) {
/// Refresh the activity according to the Account and OCFile set
setFile(file); // reset after getting it fresh from mStorageManager
getSupportActionBar().setTitle(getFile().getFileName());
//if (!stateWasRecovered) {
initViewPager();
//}
} else {
// handled file not in the current Account
finish();
}
} else {
Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
}
}

12
src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
View file

@ -40,8 +40,6 @@ import com.owncloud.android.ui.fragment.FileFragment;
//public class PreviewImagePagerAdapter extends PagerAdapter {
public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
private static final String TAG = PreviewImagePagerAdapter.class.getSimpleName();
private Vector<OCFile> mImageFiles;
private Account mAccount;
private Set<Object> mObsoleteFragments;
@ -51,14 +49,6 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
private Map<Integer, FileFragment> mCachedFragments;
/*
private final FragmentManager mFragmentManager;
private FragmentTransaction mCurTransaction = null;
private ArrayList<Fragment.SavedState> mSavedState = new ArrayList<Fragment.SavedState>();
private ArrayList<Fragment> mFragments = new ArrayList<Fragment>();
private Fragment mCurrentPrimaryItem = null;
*/
/**
* Constructor.
*
@ -188,8 +178,6 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
return mDownloadErrors.contains(Integer.valueOf(position));
}
/* -*
* Called when a change in the shown pages is going to start being made.
*

7
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file

@ -61,6 +61,7 @@ import com.owncloud.android.operations.OnRemoteOperationListener;
import com.owncloud.android.operations.RemoteOperation;
import com.owncloud.android.operations.RemoteOperationResult;
import com.owncloud.android.operations.RemoveFileOperation;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
import com.owncloud.android.ui.fragment.FileFragment;
@ -477,8 +478,8 @@ public class PreviewMediaFragment extends FileFragment implements
private void startFullScreenVideo() {
Intent i = new Intent(getActivity(), PreviewVideoActivity.class);
i.putExtra(PreviewVideoActivity.EXTRA_ACCOUNT, mAccount);
i.putExtra(PreviewVideoActivity.EXTRA_FILE, getFile());
i.putExtra(FileActivity.EXTRA_ACCOUNT, mAccount);
i.putExtra(FileActivity.EXTRA_FILE, getFile());
i.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, mVideoPreview.isPlaying());
mVideoPreview.pause();
i.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, mVideoPreview.getCurrentPosition());
@ -661,7 +662,6 @@ public class PreviewMediaFragment extends FileFragment implements
mStorageManager);
mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
getActivity().showDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
}
}
@ -716,7 +716,6 @@ public class PreviewMediaFragment extends FileFragment implements
}
private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {
boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
getActivity().dismissDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
if (result.isSuccess()) {

139
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
View file

@ -18,7 +18,6 @@
package com.owncloud.android.ui.preview;
import android.accounts.Account;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
@ -28,16 +27,18 @@ import android.media.MediaPlayer.OnErrorListener;
import android.media.MediaPlayer.OnPreparedListener;
import android.net.Uri;
import android.os.Bundle;
import android.view.MotionEvent;
import android.widget.MediaController;
import android.widget.VideoView;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.DataStorageManager;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.media.MediaService;
import com.owncloud.android.ui.activity.FileActivity;
/**
* Activity implementing a basic video player.
@ -49,14 +50,8 @@ import com.owncloud.android.media.MediaService;
*
* @author David A. Velasco
*/
public class PreviewVideoActivity extends Activity implements OnCompletionListener, OnPreparedListener, OnErrorListener {
public class PreviewVideoActivity extends FileActivity implements OnCompletionListener, OnPreparedListener, OnErrorListener {
/** Key to receive an {@link OCFile} to play as an extra value in an {@link Intent} */
public static final String EXTRA_FILE = "FILE";
/** Key to receive the ownCloud {@link Account} where the file to play is saved as an extra value in an {@link Intent} */
public static final String EXTRA_ACCOUNT = "ACCOUNT";
/** Key to receive a flag signaling if the video should be started immediately */
public static final String EXTRA_AUTOPLAY = "AUTOPLAY";
@ -65,8 +60,8 @@ public class PreviewVideoActivity extends Activity implements OnCompletionListen
private static final String TAG = PreviewVideoActivity.class.getSimpleName();
private OCFile mFile; // video file to play
private Account mAccount; // ownCloud account holding mFile
private DataStorageManager mStorageManager;
private int mSavedPlaybackPosition; // in the unit time handled by MediaPlayer.getCurrentPosition()
private boolean mAutoplay; // when 'true', the playback starts immediately with the activity
private VideoView mVideoPlayer; // view to play the file; both performs and show the playback
@ -91,14 +86,10 @@ public class PreviewVideoActivity extends Activity implements OnCompletionListen
if (savedInstanceState == null) {
Bundle extras = getIntent().getExtras();
mFile = extras.getParcelable(EXTRA_FILE);
mAccount = extras.getParcelable(EXTRA_ACCOUNT);
mSavedPlaybackPosition = extras.getInt(EXTRA_START_POSITION);
mAutoplay = extras.getBoolean(EXTRA_AUTOPLAY);
} else {
mFile = savedInstanceState.getParcelable(EXTRA_FILE);
mAccount = savedInstanceState.getParcelable(EXTRA_ACCOUNT);
mSavedPlaybackPosition = savedInstanceState.getInt(EXTRA_START_POSITION);
mAutoplay = savedInstanceState.getBoolean(EXTRA_AUTOPLAY);
}
@ -112,34 +103,6 @@ public class PreviewVideoActivity extends Activity implements OnCompletionListen
// keep the screen on while the playback is performed (prevents screen off by battery save)
mVideoPlayer.setKeepScreenOn(true);
if (mFile != null) {
if (mFile.isDown()) {
mVideoPlayer.setVideoPath(mFile.getStoragePath());
} else if (mAccount != null) {
// not working yet
String url;
try {
url = AccountUtils.constructFullURLForAccount(this, mAccount) + mFile.getRemotePath();
mVideoPlayer.setVideoURI(Uri.parse(url));
} catch (AccountNotFoundException e) {
onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account);
}
} else {
onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account);
}
// create and prepare control panel for the user
mMediaController = new MediaController(this);
mMediaController.setMediaPlayer(mVideoPlayer);
mMediaController.setAnchorView(mVideoPlayer);
mVideoPlayer.setMediaController(mMediaController);
} else {
onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_nothing_to_play);
}
}
@ -150,8 +113,6 @@ public class PreviewVideoActivity extends Activity implements OnCompletionListen
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
Log_OC.e(TAG, "ACTIVITY\t\tonSaveInstanceState");
outState.putParcelable(PreviewVideoActivity.EXTRA_FILE, mFile);
outState.putParcelable(PreviewVideoActivity.EXTRA_ACCOUNT, mAccount);
outState.putInt(PreviewVideoActivity.EXTRA_START_POSITION, mVideoPlayer.getCurrentPosition());
outState.putBoolean(PreviewVideoActivity.EXTRA_AUTOPLAY , mVideoPlayer.isPlaying());
}
@ -168,39 +129,6 @@ public class PreviewVideoActivity extends Activity implements OnCompletionListen
}
@Override
public void onResume() {
super.onResume();
Log_OC.e(TAG, "ACTIVTIY\t\tonResume");
}
@Override
public void onStart() {
super.onStart();
Log_OC.e(TAG, "ACTIVTIY\t\tonStart");
}
@Override
public void onDestroy() {
super.onDestroy();
Log_OC.e(TAG, "ACTIVITY\t\tonDestroy");
}
@Override
public void onStop() {
super.onStop();
Log_OC.e(TAG, "ACTIVTIY\t\tonStop");
}
@Override
public void onPause() {
super.onPause();
Log_OC.e(TAG, "ACTIVTIY\t\tonPause");
}
/**
* Called when the file is ready to be played.
*
@ -264,25 +192,48 @@ public class PreviewVideoActivity extends Activity implements OnCompletionListen
}
/**
* Screen touches trigger the appearance of the control panel for a limited time.
*
* {@inheritDoc}
*/
@Override
public boolean onTouchEvent (MotionEvent ev){
/*if (ev.getAction() == MotionEvent.ACTION_DOWN) {
if (mMediaController.isShowing()) {
mMediaController.hide();
} else {
mMediaController.show(MediaService.MEDIA_CONTROL_SHORT_LIFE);
protected void onAccountSet(boolean stateWasRecovered) {
if (getAccount() != null) {
OCFile file = getFile();
/// Validate handled file (first image to preview)
if (file == null) {
throw new IllegalStateException("Instanced with a NULL OCFile");
}
if (!file.isVideo()) {
throw new IllegalArgumentException("Non-video file passed as argument");
}
mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver());
file = mStorageManager.getFileById(file.getFileId());
if (file != null) {
if (file.isDown()) {
mVideoPlayer.setVideoPath(file.getStoragePath());
} else {
// not working yet
String url;
try {
url = AccountUtils.constructFullURLForAccount(this, getAccount()) + file.getRemotePath();
mVideoPlayer.setVideoURI(Uri.parse(url));
} catch (AccountNotFoundException e) {
onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account);
}
}
// create and prepare control panel for the user
mMediaController = new MediaController(this);
mMediaController.setMediaPlayer(mVideoPlayer);
mMediaController.setAnchorView(mVideoPlayer);
mVideoPlayer.setMediaController(mMediaController);
} else {
finish();
}
return true;
} else {
return false;
}*/
return false;
}
Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
finish();
}
}
}