mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 17:46:37 +03:00
consistently use UploadList (instead UploadsList)
This commit is contained in:
Luke Owncloud
parent
79c3756857
commit
d59fd3b77a
8 changed files with 209 additions and 209 deletions
|
|
@ -163,7 +163,7 @@
|
|||
<activity android:name=".ui.activity.LogHistoryActivity"/>
|
||||
|
||||
<activity android:name=".ui.errorhandling.ErrorShowActivity" />
|
||||
<activity android:name=".ui.activity.UploadsListActivity" >
|
||||
<activity android:name=".ui.activity.UploadListActivity" >
|
||||
|
||||
<!-- for testing only: -->
|
||||
<intent-filter>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
android:layout_height="match_parent" >
|
||||
|
||||
<fragment
|
||||
android:id="@+id/UploadsListFragment"
|
||||
android:id="@+id/UploadListFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
class="com.owncloud.android.ui.fragment.UploadsListFragment" />
|
||||
class="com.owncloud.android.ui.fragment.UploadListFragment" />
|
||||
|
||||
</FrameLayout>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
android:showAsAction="never"
|
||||
android:title="@string/actionbar_sort"/>
|
||||
<item
|
||||
android:id="@+id/action_uploads_list"
|
||||
android:id="@+id/action_upload_list"
|
||||
android:icon="@drawable/ic_action_settings"
|
||||
android:orderInCategory="2"
|
||||
android:showAsAction="never"
|
||||
|
|
|
|||
|
|
@ -106,15 +106,15 @@ import com.owncloud.android.utils.ErrorMessageAdapter;
|
|||
|
||||
/**
|
||||
* Displays, what files the user has available in his ownCloud. This is the main view.
|
||||
*
|
||||
*
|
||||
* @author Bartek Przybylski
|
||||
* @author David A. Velasco
|
||||
*/
|
||||
|
||||
public class FileDisplayActivity extends HookActivity implements
|
||||
FileFragment.ContainerActivity, OnNavigationListener,
|
||||
FileFragment.ContainerActivity, OnNavigationListener,
|
||||
OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
||||
|
||||
|
||||
private ArrayAdapter<String> mDirectories;
|
||||
|
||||
private SyncBroadcastReceiver mSyncBroadcastReceiver;
|
||||
|
|
@ -133,7 +133,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
public static final int DIALOG_SHORT_WAIT = 0;
|
||||
private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1;
|
||||
private static final int DIALOG_CERT_NOT_SAVED = 2;
|
||||
|
||||
|
||||
public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS";
|
||||
|
||||
private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
|
||||
|
|
@ -146,13 +146,13 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
private static final String TAG_SECOND_FRAGMENT = "SECOND_FRAGMENT";
|
||||
|
||||
private OCFile mWaitingToPreview;
|
||||
|
||||
|
||||
private boolean mSyncInProgress = false;
|
||||
|
||||
private String DIALOG_UNTRUSTED_CERT;
|
||||
|
||||
|
||||
private OCFile mWaitingToSend;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
Log_OC.d(TAG, "onCreate() start");
|
||||
|
|
@ -172,23 +172,23 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
Intent initObserversIntent = FileObserverService.makeInitIntent(this);
|
||||
startService(initObserversIntent);
|
||||
}
|
||||
|
||||
|
||||
/// Load of saved instance state
|
||||
if(savedInstanceState != null) {
|
||||
mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
|
||||
mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
|
||||
mWaitingToSend = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_SEND);
|
||||
|
||||
|
||||
} else {
|
||||
mWaitingToPreview = null;
|
||||
mSyncInProgress = false;
|
||||
mWaitingToSend = null;
|
||||
}
|
||||
}
|
||||
|
||||
/// USER INTERFACE
|
||||
|
||||
// Inflate and set the layout view
|
||||
setContentView(R.layout.files);
|
||||
setContentView(R.layout.files);
|
||||
mDualPane = getResources().getBoolean(R.bool.large_land_layout);
|
||||
mLeftFragmentContainer = findViewById(R.id.left_fragment_container);
|
||||
mRightFragmentContainer = findViewById(R.id.right_fragment_container);
|
||||
|
|
@ -200,12 +200,12 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
|
||||
getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
|
||||
setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/); // always AFTER setContentView(...) ; to work around bug in its implementation
|
||||
|
||||
|
||||
setBackgroundText();
|
||||
|
||||
Log_OC.d(TAG, "onCreate() end");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onStart() {
|
||||
super.onStart();
|
||||
|
|
@ -219,7 +219,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
/**
|
||||
* Called when the ownCloud {@link Account} associated to the Activity was just updated.
|
||||
*/
|
||||
*/
|
||||
@Override
|
||||
protected void onAccountSet(boolean stateWasRecovered) {
|
||||
super.onAccountSet(stateWasRecovered);
|
||||
|
|
@ -245,14 +245,14 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
setFile(file);
|
||||
setNavigationListWithFolder(file);
|
||||
|
||||
|
||||
if (!stateWasRecovered) {
|
||||
Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
|
||||
initFragmentsWithFile();
|
||||
if (file.isFolder()) {
|
||||
startSyncFolderOperation(file, false);
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
updateFragmentsVisibility(!file.isFolder());
|
||||
updateNavigationElementsInActionBar(file.isFolder() ? null : file);
|
||||
|
|
@ -283,25 +283,25 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES);
|
||||
transaction.commit();
|
||||
}
|
||||
|
||||
|
||||
private void initFragmentsWithFile() {
|
||||
if (getAccount() != null && getFile() != null) {
|
||||
/// First fragment
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
if (listOfFiles != null) {
|
||||
listOfFiles.listDirectory(getCurrentDir());
|
||||
listOfFiles.listDirectory(getCurrentDir());
|
||||
} else {
|
||||
Log_OC.e(TAG, "Still have a chance to lose the initializacion of list fragment >(");
|
||||
}
|
||||
|
||||
|
||||
/// Second fragment
|
||||
OCFile file = getFile();
|
||||
OCFile file = getFile();
|
||||
Fragment secondFragment = chooseInitialSecondFragment(file);
|
||||
if (secondFragment != null) {
|
||||
setSecondFragment(secondFragment);
|
||||
updateFragmentsVisibility(true);
|
||||
updateNavigationElementsInActionBar(file);
|
||||
|
||||
|
||||
} else {
|
||||
cleanSecondFragment();
|
||||
}
|
||||
|
|
@ -320,7 +320,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
private Fragment chooseInitialSecondFragment(OCFile file) {
|
||||
Fragment secondFragment = null;
|
||||
if (file != null && !file.isFolder()) {
|
||||
if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)
|
||||
if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)
|
||||
&& file.getLastSyncDateForProperties() > 0 // temporal fix
|
||||
) {
|
||||
int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
|
||||
|
|
@ -338,9 +338,9 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
/**
|
||||
* Replaces the second fragment managed by the activity with the received as
|
||||
* a parameter.
|
||||
*
|
||||
* Assumes never will be more than two fragments managed at the same time.
|
||||
*
|
||||
*
|
||||
* Assumes never will be more than two fragments managed at the same time.
|
||||
*
|
||||
* @param fragment New second Fragment to set.
|
||||
*/
|
||||
private void setSecondFragment(Fragment fragment) {
|
||||
|
|
@ -408,7 +408,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
protected void refreshListOfFilesFragment() {
|
||||
OCFileListFragment fileListFragment = getListOfFilesFragment();
|
||||
if (fileListFragment != null) {
|
||||
if (fileListFragment != null) {
|
||||
fileListFragment.listDirectory();
|
||||
}
|
||||
}
|
||||
|
|
@ -420,7 +420,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
FileDetailFragment detailsFragment = (FileDetailFragment) secondFragment;
|
||||
OCFile fileInFragment = detailsFragment.getFile();
|
||||
if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {
|
||||
// the user browsed to other file ; forget the automatic preview
|
||||
// the user browsed to other file ; forget the automatic preview
|
||||
mWaitingToPreview = null;
|
||||
|
||||
} else if (downloadEvent.equals(FileDownloader.getDownloadAddedMessage())) {
|
||||
|
|
@ -472,7 +472,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
boolean retval = true;
|
||||
switch (item.getItemId()) {
|
||||
case R.id.action_create_dir: {
|
||||
CreateFolderDialogFragment dialog =
|
||||
CreateFolderDialogFragment dialog =
|
||||
CreateFolderDialogFragment.newInstance(getCurrentDir());
|
||||
dialog.show(getSupportFragmentManager(), "createdirdialog");
|
||||
break;
|
||||
|
|
@ -495,34 +495,34 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
startActivity(loggerIntent);
|
||||
break;
|
||||
}
|
||||
case R.id.action_uploads_list: {
|
||||
Intent uploadListIntent = new Intent(getApplicationContext(),UploadsListActivity.class);
|
||||
case R.id.action_upload_list: {
|
||||
Intent uploadListIntent = new Intent(getApplicationContext(),UploadListActivity.class);
|
||||
startActivity(uploadListIntent);
|
||||
break;
|
||||
}
|
||||
case android.R.id.home: {
|
||||
FileFragment second = getSecondFragment();
|
||||
OCFile currentDir = getCurrentDir();
|
||||
if((currentDir != null && currentDir.getParentId() != 0) ||
|
||||
(second != null && second.getFile() != null)) {
|
||||
onBackPressed();
|
||||
|
||||
if((currentDir != null && currentDir.getParentId() != 0) ||
|
||||
(second != null && second.getFile() != null)) {
|
||||
onBackPressed();
|
||||
|
||||
}
|
||||
break;
|
||||
}
|
||||
case R.id.action_sort: {
|
||||
SharedPreferences appPreferences = PreferenceManager
|
||||
.getDefaultSharedPreferences(this);
|
||||
|
||||
|
||||
// Read sorting order, default to sort by name ascending
|
||||
Integer sortOrder = appPreferences
|
||||
.getInt("sortOrder", FileListListAdapter.SORT_NAME);
|
||||
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setTitle(R.string.actionbar_sort_title)
|
||||
.setSingleChoiceItems(R.array.actionbar_sortby, sortOrder , new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
|
||||
|
||||
switch (which){
|
||||
case 0:
|
||||
sortByName(true);
|
||||
|
|
@ -530,15 +530,15 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
case 1:
|
||||
sortByDate(false);
|
||||
break;
|
||||
|
||||
// TODO re-enable when server-side folder size calculation is available
|
||||
|
||||
// TODO re-enable when server-side folder size calculation is available
|
||||
// case 2:
|
||||
// sortBySize(false);
|
||||
// break;
|
||||
}
|
||||
|
||||
|
||||
dialog.dismiss();
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
builder.create().show();
|
||||
|
|
@ -580,18 +580,18 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
if (itemPosition != 0) {
|
||||
String targetPath = "";
|
||||
for (int i=itemPosition; i < mDirectories.getCount() - 1; i++) {
|
||||
targetPath = mDirectories.getItem(i) + OCFile.PATH_SEPARATOR + targetPath;
|
||||
targetPath = mDirectories.getItem(i) + OCFile.PATH_SEPARATOR + targetPath;
|
||||
}
|
||||
targetPath = OCFile.PATH_SEPARATOR + targetPath;
|
||||
OCFile targetFolder = getStorageManager().getFileByPath(targetPath);
|
||||
if (targetFolder != null) {
|
||||
browseTo(targetFolder);
|
||||
}
|
||||
|
||||
// the next operation triggers a new call to this method, but it's necessary to
|
||||
// ensure that the name exposed in the action bar is the current directory when the
|
||||
|
||||
// the next operation triggers a new call to this method, but it's necessary to
|
||||
// ensure that the name exposed in the action bar is the current directory when the
|
||||
// user selected it in the navigation list
|
||||
if (getSupportActionBar().getNavigationMode() == ActionBar.NAVIGATION_MODE_LIST && itemPosition != 0)
|
||||
if (getSupportActionBar().getNavigationMode() == ActionBar.NAVIGATION_MODE_LIST && itemPosition != 0)
|
||||
getSupportActionBar().setSelectedNavigationItem(0);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -609,18 +609,18 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
} else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
|
||||
requestMultipleUpload(data, resultCode);
|
||||
|
||||
} else if (requestCode == ACTION_MOVE_FILES && (resultCode == RESULT_OK ||
|
||||
} else if (requestCode == ACTION_MOVE_FILES && (resultCode == RESULT_OK ||
|
||||
resultCode == MoveActivity.RESULT_OK_AND_MOVE)){
|
||||
|
||||
final Intent fData = data;
|
||||
final int fResultCode = resultCode;
|
||||
final int fResultCode = resultCode;
|
||||
getHandler().postDelayed(
|
||||
new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
requestMoveOperation(fData, fResultCode);
|
||||
}
|
||||
},
|
||||
},
|
||||
DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
|
||||
);
|
||||
}
|
||||
|
|
@ -708,7 +708,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
/**
|
||||
* Request the operation for moving the file/folder from one path to another
|
||||
*
|
||||
*
|
||||
* @param data Intent received
|
||||
* @param resultCode Result code received
|
||||
*/
|
||||
|
|
@ -720,7 +720,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
if (mDualPane || getSecondFragment() == null) {
|
||||
if (listOfFiles != null) { // should never be null, indeed
|
||||
if (mDirectories.getCount() <= 1) {
|
||||
|
|
@ -752,14 +752,14 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
Log_OC.d(TAG, "onSaveInstanceState() end");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
Log_OC.e(TAG, "onResume() start");
|
||||
|
||||
|
||||
// refresh list of files
|
||||
refreshListOfFilesFragment();
|
||||
|
||||
|
|
@ -783,7 +783,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage());
|
||||
mDownloadFinishReceiver = new DownloadFinishReceiver();
|
||||
registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
|
||||
|
||||
|
||||
Log_OC.d(TAG, "onResume() end");
|
||||
}
|
||||
|
||||
|
|
@ -804,8 +804,8 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
unregisterReceiver(mDownloadFinishReceiver);
|
||||
mDownloadFinishReceiver = null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Log_OC.d(TAG, "onPause() end");
|
||||
super.onPause();
|
||||
}
|
||||
|
|
@ -890,7 +890,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
|
||||
cursor.moveToFirst();
|
||||
return cursor.getString(column_index);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -928,7 +928,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
((TextView) v).setTextColor(getResources().getColorStateList(
|
||||
android.R.color.white));
|
||||
|
||||
|
||||
fixRoot((TextView) v );
|
||||
return v;
|
||||
}
|
||||
|
|
@ -963,27 +963,27 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
String event = intent.getAction();
|
||||
Log_OC.d(TAG, "Received broadcast " + event);
|
||||
String accountName = intent.getStringExtra(FileSyncAdapter.EXTRA_ACCOUNT_NAME);
|
||||
String synchFolderRemotePath = intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH);
|
||||
String synchFolderRemotePath = intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH);
|
||||
RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncAdapter.EXTRA_RESULT);
|
||||
boolean sameAccount = (getAccount() != null && accountName.equals(getAccount().name) && getStorageManager() != null);
|
||||
|
||||
boolean sameAccount = (getAccount() != null && accountName.equals(getAccount().name) && getStorageManager() != null);
|
||||
|
||||
if (sameAccount) {
|
||||
|
||||
|
||||
if (FileSyncAdapter.EVENT_FULL_SYNC_START.equals(event)) {
|
||||
mSyncInProgress = true;
|
||||
|
||||
|
||||
} else {
|
||||
OCFile currentFile = (getFile() == null) ? null : getStorageManager().getFileByPath(getFile().getRemotePath());
|
||||
OCFile currentDir = (getCurrentDir() == null) ? null : getStorageManager().getFileByPath(getCurrentDir().getRemotePath());
|
||||
|
||||
|
||||
if (currentDir == null) {
|
||||
// current folder was removed from the server
|
||||
Toast.makeText( FileDisplayActivity.this,
|
||||
String.format(getString(R.string.sync_current_folder_was_removed), mDirectories.getItem(0)),
|
||||
// current folder was removed from the server
|
||||
Toast.makeText( FileDisplayActivity.this,
|
||||
String.format(getString(R.string.sync_current_folder_was_removed), mDirectories.getItem(0)),
|
||||
Toast.LENGTH_LONG)
|
||||
.show();
|
||||
browseToRoot();
|
||||
|
||||
|
||||
} else {
|
||||
if (currentFile == null && !getFile().isFolder()) {
|
||||
// currently selected file was removed in the server, and now we know it
|
||||
|
|
@ -999,21 +999,21 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
setFile(currentFile);
|
||||
}
|
||||
|
||||
|
||||
mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) && !SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
|
||||
|
||||
|
||||
if (SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
|
||||
equals(event) &&
|
||||
/// TODO refactor and make common
|
||||
synchResult != null && !synchResult.isSuccess() &&
|
||||
(synchResult.getCode() == ResultCode.UNAUTHORIZED ||
|
||||
synchResult != null && !synchResult.isSuccess() &&
|
||||
(synchResult.getCode() == ResultCode.UNAUTHORIZED ||
|
||||
synchResult.isIdPRedirection() ||
|
||||
(synchResult.isException() && synchResult.getException()
|
||||
(synchResult.isException() && synchResult.getException()
|
||||
instanceof AuthenticatorException))) {
|
||||
|
||||
OwnCloudClient client = null;
|
||||
try {
|
||||
OwnCloudAccount ocAccount =
|
||||
OwnCloudAccount ocAccount =
|
||||
new OwnCloudAccount(getAccount(), context);
|
||||
client = (OwnCloudClientManagerFactory.getDefaultSingleton().
|
||||
removeClientFor(ocAccount));
|
||||
|
|
@ -1027,14 +1027,14 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
if (client != null) {
|
||||
OwnCloudCredentials cred = client.getCredentials();
|
||||
if (cred != null) {
|
||||
AccountManager am = AccountManager.get(context);
|
||||
if (cred.authTokenExpires()) {
|
||||
am.invalidateAuthToken(
|
||||
getAccount().type,
|
||||
getAccount().type,
|
||||
cred.getAuthToken()
|
||||
);
|
||||
} else {
|
||||
|
|
@ -1042,9 +1042,9 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
requestCredentialsUpdate();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
removeStickyBroadcast(intent);
|
||||
|
|
@ -1052,22 +1052,22 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
|
||||
|
||||
setBackgroundText();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (synchResult != null) {
|
||||
if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
|
||||
mLastSslUntrustedServerResult = synchResult;
|
||||
}
|
||||
}
|
||||
} catch (RuntimeException e) {
|
||||
// avoid app crashes after changing the serial id of RemoteOperationResult
|
||||
// avoid app crashes after changing the serial id of RemoteOperationResult
|
||||
// in owncloud library with broadcast notifications pending to process
|
||||
removeStickyBroadcast(intent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Show a text message on screen view for notifying user if content is
|
||||
* loading or folder is empty
|
||||
|
|
@ -1102,22 +1102,22 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
String accountName = intent.getStringExtra(FileUploadService.ACCOUNT_NAME);
|
||||
boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
|
||||
OCFile currentDir = getCurrentDir();
|
||||
boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) &&
|
||||
boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) &&
|
||||
(uploadedRemotePath.startsWith(currentDir.getRemotePath()));
|
||||
|
||||
|
||||
if (sameAccount && isDescendant) {
|
||||
refreshListOfFilesFragment();
|
||||
}
|
||||
|
||||
|
||||
boolean uploadWasFine = intent.getBooleanExtra(FileUploadService.EXTRA_UPLOAD_RESULT, false);
|
||||
boolean renamedInUpload = getFile().getRemotePath().
|
||||
equals(intent.getStringExtra(FileUploadService.EXTRA_OLD_REMOTE_PATH));
|
||||
boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) ||
|
||||
boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) ||
|
||||
renamedInUpload;
|
||||
FileFragment details = getSecondFragment();
|
||||
boolean detailFragmentIsShown = (details != null &&
|
||||
boolean detailFragmentIsShown = (details != null &&
|
||||
details instanceof FileDetailFragment);
|
||||
|
||||
|
||||
if (sameAccount && sameFile && detailFragmentIsShown) {
|
||||
if (uploadWasFine) {
|
||||
setFile(getStorageManager().getFileByPath(uploadedRemotePath));
|
||||
|
|
@ -1125,10 +1125,10 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
if (renamedInUpload) {
|
||||
String newName = (new File(uploadedRemotePath)).getName();
|
||||
Toast msg = Toast.makeText(
|
||||
context,
|
||||
context,
|
||||
String.format(
|
||||
getString(R.string.filedetails_renamed_in_upload_msg),
|
||||
newName),
|
||||
getString(R.string.filedetails_renamed_in_upload_msg),
|
||||
newName),
|
||||
Toast.LENGTH_LONG);
|
||||
msg.show();
|
||||
}
|
||||
|
|
@ -1137,27 +1137,27 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
} else {
|
||||
cleanSecondFragment();
|
||||
}
|
||||
|
||||
|
||||
// Force the preview if the file is an image
|
||||
if (uploadWasFine && PreviewImageFragment.canBePreviewed(getFile())) {
|
||||
startImagePreview(getFile());
|
||||
} // TODO what about other kind of previews?
|
||||
}
|
||||
|
||||
|
||||
} finally {
|
||||
if (intent != null) {
|
||||
removeStickyBroadcast(intent);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Class waiting for broadcast events from the {@link FielDownloader} service.
|
||||
*
|
||||
*
|
||||
* Updates the UI when a download is started or finished, provided that it is relevant for the
|
||||
* current folder.
|
||||
*/
|
||||
|
|
@ -1168,19 +1168,19 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
boolean sameAccount = isSameAccount(context, intent);
|
||||
String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
|
||||
boolean isDescendant = isDescendant(downloadedRemotePath);
|
||||
|
||||
|
||||
if (sameAccount && isDescendant) {
|
||||
refreshListOfFilesFragment();
|
||||
refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
|
||||
}
|
||||
|
||||
|
||||
if (mWaitingToSend != null) {
|
||||
mWaitingToSend = getStorageManager().getFileByPath(mWaitingToSend.getRemotePath()); // Update the file to send
|
||||
if (mWaitingToSend.isDown()) {
|
||||
if (mWaitingToSend.isDown()) {
|
||||
sendDownloadedFile();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} finally {
|
||||
if (intent != null) {
|
||||
removeStickyBroadcast(intent);
|
||||
|
|
@ -1198,10 +1198,10 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
return (accountName != null && getAccount() != null && accountName.equals(getAccount().name));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public void browseToRoot() {
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
if (listOfFiles != null) { // should never be null, indeed
|
||||
while (mDirectories.getCount() > 1) {
|
||||
popDirname();
|
||||
|
|
@ -1213,13 +1213,13 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
cleanSecondFragment();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public void browseTo(OCFile folder) {
|
||||
if (folder == null || !folder.isFolder()) {
|
||||
throw new IllegalArgumentException("Trying to browse to invalid folder " + folder);
|
||||
}
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
if (listOfFiles != null) {
|
||||
setNavigationListWithFolder(folder);
|
||||
listOfFiles.listDirectory(folder);
|
||||
|
|
@ -1234,23 +1234,23 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*
|
||||
*
|
||||
* Updates action bar and second fragment, if in dual pane mode.
|
||||
*/
|
||||
@Override
|
||||
public void onBrowsedDownTo(OCFile directory) {
|
||||
pushDirname(directory);
|
||||
cleanSecondFragment();
|
||||
|
||||
|
||||
// Sync Folder
|
||||
startSyncFolderOperation(directory, false);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows the information of the {@link OCFile} received as a
|
||||
* Shows the information of the {@link OCFile} received as a
|
||||
* parameter in the second fragment.
|
||||
*
|
||||
*
|
||||
* @param file {@link OCFile} whose details will be shown
|
||||
*/
|
||||
@Override
|
||||
|
|
@ -1267,13 +1267,13 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
* TODO
|
||||
*/
|
||||
private void updateNavigationElementsInActionBar(OCFile chosenFile) {
|
||||
ActionBar actionBar = getSupportActionBar();
|
||||
ActionBar actionBar = getSupportActionBar();
|
||||
if (chosenFile == null || mDualPane) {
|
||||
// only list of files - set for browsing through folders
|
||||
OCFile currentDir = getCurrentDir();
|
||||
boolean noRoot = (currentDir != null && currentDir.getParentId() != 0);
|
||||
actionBar.setDisplayHomeAsUpEnabled(noRoot);
|
||||
actionBar.setDisplayShowTitleEnabled(!noRoot);
|
||||
actionBar.setDisplayShowTitleEnabled(!noRoot);
|
||||
if (!noRoot) {
|
||||
actionBar.setTitle(getString(R.string.default_display_name_for_root_folder));
|
||||
}
|
||||
|
|
@ -1317,7 +1317,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
return;
|
||||
}
|
||||
// a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
OCFileListFragment listOfFiles = getListOfFilesFragment();
|
||||
if (listOfFiles != null) {
|
||||
listOfFiles.listDirectory();
|
||||
}
|
||||
|
|
@ -1339,7 +1339,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
mUploaderBinder = null;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
|
@ -1377,14 +1377,14 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
/**
|
||||
* 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 onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
|
||||
super.onRemoteOperationFinish(operation, result);
|
||||
|
||||
|
||||
if (operation instanceof RemoveFileOperation) {
|
||||
onRemoveFileOperationFinish((RemoveFileOperation)operation, result);
|
||||
|
||||
|
|
@ -1396,20 +1396,20 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
} else if (operation instanceof CreateFolderOperation) {
|
||||
onCreateFolderOperationFinish((CreateFolderOperation)operation, result);
|
||||
|
||||
|
||||
} else if (operation instanceof CreateShareOperation) {
|
||||
onCreateShareOperationFinish((CreateShareOperation) operation, result);
|
||||
|
||||
|
||||
} else if (operation instanceof UnshareLinkOperation) {
|
||||
onUnshareLinkOperationFinish((UnshareLinkOperation)operation, result);
|
||||
|
||||
|
||||
} else if (operation instanceof MoveFileOperation) {
|
||||
onMoveFileOperationFinish((MoveFileOperation)operation, result);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
|
||||
if (result.isSuccess()) {
|
||||
refreshShowDetails();
|
||||
|
|
@ -1417,49 +1417,49 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void onUnshareLinkOperationFinish(UnshareLinkOperation operation, RemoteOperationResult result) {
|
||||
if (result.isSuccess()) {
|
||||
refreshShowDetails();
|
||||
refreshListOfFilesFragment();
|
||||
|
||||
|
||||
} else if (result.getCode() == ResultCode.SHARE_NOT_FOUND) {
|
||||
cleanSecondFragment();
|
||||
refreshListOfFilesFragment();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void refreshShowDetails() {
|
||||
FileFragment details = getSecondFragment();
|
||||
if (details != null) {
|
||||
OCFile file = details.getFile();
|
||||
if (file != null) {
|
||||
file = getStorageManager().getFileByPath(file.getRemotePath());
|
||||
file = getStorageManager().getFileByPath(file.getRemotePath());
|
||||
if (details instanceof PreviewMediaFragment) {
|
||||
// Refresh OCFile of the fragment
|
||||
((PreviewMediaFragment) details).updateFile(file);
|
||||
} else {
|
||||
showDetails(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
invalidateOptionsMenu();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Updates the view associated to the activity after the finish of an operation trying to remove a
|
||||
* file.
|
||||
*
|
||||
* Updates the view associated to the activity after the finish of an operation trying to remove a
|
||||
* file.
|
||||
*
|
||||
* @param operation Removal operation performed.
|
||||
* @param result Result of the removal.
|
||||
*/
|
||||
private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {
|
||||
dismissLoadingDialog();
|
||||
|
||||
Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
|
||||
Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
msg.show();
|
||||
|
||||
|
||||
if (result.isSuccess()) {
|
||||
OCFile removedFile = operation.getFile();
|
||||
FileFragment second = getSecondFragment();
|
||||
|
|
@ -1481,12 +1481,12 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Updates the view associated to the activity after the finish of an operation trying to move a
|
||||
* Updates the view associated to the activity after the finish of an operation trying to move a
|
||||
* file.
|
||||
*
|
||||
*
|
||||
* @param operation Move operation performed.
|
||||
* @param result Result of the move operation.
|
||||
*/
|
||||
|
|
@ -1497,9 +1497,9 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
} else {
|
||||
dismissLoadingDialog();
|
||||
try {
|
||||
Toast msg = Toast.makeText(FileDisplayActivity.this,
|
||||
ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
Toast msg = Toast.makeText(FileDisplayActivity.this,
|
||||
ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
msg.show();
|
||||
|
||||
} catch (NotFoundException e) {
|
||||
|
|
@ -1510,9 +1510,9 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
|
||||
/**
|
||||
* Updates the view associated to the activity after the finish of an operation trying to rename a
|
||||
* file.
|
||||
*
|
||||
* Updates the view associated to the activity after the finish of an operation trying to rename a
|
||||
* file.
|
||||
*
|
||||
* @param operation Renaming operation performed.
|
||||
* @param result Result of the renaming.
|
||||
*/
|
||||
|
|
@ -1536,16 +1536,16 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (getStorageManager().getFileById(renamedFile.getParentId()).equals(getCurrentDir())) {
|
||||
refreshListOfFilesFragment();
|
||||
}
|
||||
|
||||
} else {
|
||||
Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
msg.show();
|
||||
|
||||
|
||||
if (result.isSslRecoverableException()) {
|
||||
mLastSslUntrustedServerResult = result;
|
||||
showUntrustedCertDialog(mLastSslUntrustedServerResult);
|
||||
|
|
@ -1563,15 +1563,15 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, getAccount());
|
||||
startActivity(i);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
if (operation.transferWasRequested()) {
|
||||
onTransferStateChanged(syncedFile, true, true);
|
||||
|
||||
|
||||
} else {
|
||||
Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
Toast msg = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
msg.show();
|
||||
}
|
||||
}
|
||||
|
|
@ -1579,7 +1579,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
/**
|
||||
* Updates the view associated to the activity after the finish of an operation trying create a new folder
|
||||
*
|
||||
*
|
||||
* @param operation Creation operation performed.
|
||||
* @param result Result of the creation.
|
||||
*/
|
||||
|
|
@ -1590,9 +1590,9 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
} else {
|
||||
dismissLoadingDialog();
|
||||
try {
|
||||
Toast msg = Toast.makeText(FileDisplayActivity.this,
|
||||
ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
Toast msg = Toast.makeText(FileDisplayActivity.this,
|
||||
ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
|
||||
Toast.LENGTH_LONG);
|
||||
msg.show();
|
||||
|
||||
} catch (NotFoundException e) {
|
||||
|
|
@ -1601,7 +1601,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
|
@ -1620,7 +1620,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1647,31 +1647,31 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {
|
||||
long currentSyncTime = System.currentTimeMillis();
|
||||
|
||||
long currentSyncTime = System.currentTimeMillis();
|
||||
|
||||
mSyncInProgress = true;
|
||||
|
||||
|
||||
// perform folder synchronization
|
||||
RemoteOperation synchFolderOp = new SynchronizeFolderOperation( folder,
|
||||
currentSyncTime,
|
||||
RemoteOperation synchFolderOp = new SynchronizeFolderOperation( folder,
|
||||
currentSyncTime,
|
||||
false,
|
||||
getFileOperationsHelper().isSharedSupported(),
|
||||
ignoreETag,
|
||||
getStorageManager(),
|
||||
getAccount(),
|
||||
getStorageManager(),
|
||||
getAccount(),
|
||||
getApplicationContext()
|
||||
);
|
||||
synchFolderOp.execute(getAccount(), this, null, null);
|
||||
|
||||
|
||||
setSupportProgressBarIndeterminateVisibility(true);
|
||||
|
||||
setBackgroundText();
|
||||
}
|
||||
|
||||
/**
|
||||
* Show untrusted cert dialog
|
||||
* Show untrusted cert dialog
|
||||
*/
|
||||
public void showUntrustedCertDialog(RemoteOperationResult result) {
|
||||
// Show a dialog with the certificate info
|
||||
|
|
@ -1680,7 +1680,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
FragmentTransaction ft = fm.beginTransaction();
|
||||
dialog.show(ft, DIALOG_UNTRUSTED_CERT);
|
||||
}
|
||||
|
||||
|
||||
private void requestForDownload(OCFile file) {
|
||||
Account account = getAccount();
|
||||
if (!mDownloaderBinder.isDownloading(account, file)) {
|
||||
|
|
@ -1690,18 +1690,18 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
startService(i);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void sendDownloadedFile(){
|
||||
getFileOperationsHelper().sendDownloadedFile(mWaitingToSend);
|
||||
mWaitingToSend = null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Requests the download of the received {@link OCFile} , updates the UI
|
||||
* to monitor the download progress and prepares the activity to send the file
|
||||
* when the download finishes.
|
||||
*
|
||||
*
|
||||
* @param file {@link OCFile} to download and preview.
|
||||
*/
|
||||
public void startDownloadForSending(OCFile file) {
|
||||
|
|
@ -1710,10 +1710,10 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
boolean hasSecondFragment = (getSecondFragment()!= null);
|
||||
updateFragmentsVisibility(hasSecondFragment);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Opens the image gallery showing the image {@link OCFile} received as parameter.
|
||||
*
|
||||
*
|
||||
* @param file Image {@link OCFile} to show.
|
||||
*/
|
||||
public void startImagePreview(OCFile file) {
|
||||
|
|
@ -1721,12 +1721,12 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
showDetailsIntent.putExtra(EXTRA_FILE, file);
|
||||
showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount());
|
||||
startActivity(showDetailsIntent);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Stars the preview of an already down media {@link OCFile}.
|
||||
*
|
||||
*
|
||||
* @param file Media {@link OCFile} to preview.
|
||||
* @param startPlaybackPosition Media position where the playback will be started, in milliseconds.
|
||||
* @param autoplay When 'true', the playback will start without user interactions.
|
||||
|
|
@ -1743,7 +1743,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
* Requests the download of the received {@link OCFile} , updates the UI
|
||||
* to monitor the download progress and prepares the activity to preview
|
||||
* or open the file when the download finishes.
|
||||
*
|
||||
*
|
||||
* @param file {@link OCFile} to download and preview.
|
||||
*/
|
||||
public void startDownloadForPreview(OCFile file) {
|
||||
|
|
@ -1759,7 +1759,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
|
|||
|
||||
public void cancelTransference(OCFile file) {
|
||||
getFileOperationsHelper().cancelTransference(file);
|
||||
if (mWaitingToPreview != null &&
|
||||
if (mWaitingToPreview != null &&
|
||||
mWaitingToPreview.getRemotePath().equals(file.getRemotePath())) {
|
||||
mWaitingToPreview = null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,26 +7,26 @@ import android.os.Bundle;
|
|||
import com.owncloud.android.R;
|
||||
import com.owncloud.android.db.UploadDbHandler;
|
||||
import com.owncloud.android.ui.errorhandling.ExceptionHandler;
|
||||
import com.owncloud.android.ui.fragment.UploadsListFragment;
|
||||
import com.owncloud.android.ui.fragment.UploadListFragment;
|
||||
|
||||
/**
|
||||
* Activity listing pending, active, and completed uploads. User can delete
|
||||
* completed uploads from view. Content of this list of coming from
|
||||
* {@link UploadDbHandler}.
|
||||
*/
|
||||
public class UploadsListActivity extends FileActivity implements UploadsListFragment.ContainerActivity {
|
||||
public class UploadListActivity extends FileActivity implements UploadListFragment.ContainerActivity {
|
||||
|
||||
private static final String TAG = "UploadsListActivity";
|
||||
private static final String TAG = "UploadListActivity";
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
|
||||
setContentView(R.layout.uploads_list_layout);
|
||||
setContentView(R.layout.upload_list_layout);
|
||||
}
|
||||
|
||||
// ////////////////////////////////////////
|
||||
// UploadsListFragment.ContainerActivity
|
||||
// UploadListFragment.ContainerActivity
|
||||
// ////////////////////////////////////////
|
||||
@Override
|
||||
public void onUploadItemClick(File file) {
|
||||
|
|
@ -26,12 +26,12 @@ import com.owncloud.android.utils.DisplayUtils;
|
|||
* Filtering possible.
|
||||
*
|
||||
*/
|
||||
public class UploadsListAdapter extends BaseAdapter implements ListAdapter {
|
||||
public class UploadListAdapter extends BaseAdapter implements ListAdapter {
|
||||
|
||||
private Context mContext;
|
||||
private UploadDbObject[] mUploads = null;
|
||||
|
||||
public UploadsListAdapter(Context context) {
|
||||
public UploadListAdapter(Context context) {
|
||||
mContext = context;
|
||||
loadUploadItemsFromDb();
|
||||
}
|
||||
|
|
@ -74,7 +74,7 @@ public class UploadsListAdapter extends BaseAdapter implements ListAdapter {
|
|||
if (view == null) {
|
||||
LayoutInflater inflator = (LayoutInflater) mContext
|
||||
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
view = inflator.inflate(R.layout.uploads_list_item, null);
|
||||
view = inflator.inflate(R.layout.upload_list_item, null);
|
||||
}
|
||||
if (mUploads != null && mUploads.length > position) {
|
||||
UploadDbObject file = mUploads[position];
|
||||
|
|
@ -32,25 +32,25 @@ import android.widget.ListView;
|
|||
|
||||
import com.owncloud.android.R;
|
||||
import com.owncloud.android.lib.common.utils.Log_OC;
|
||||
import com.owncloud.android.ui.adapter.UploadsListAdapter;
|
||||
import com.owncloud.android.ui.adapter.UploadListAdapter;
|
||||
|
||||
/**
|
||||
* A Fragment that lists all files and folders in a given LOCAL path.
|
||||
*
|
||||
*
|
||||
* @author LukeOwncloud
|
||||
*
|
||||
*
|
||||
*/
|
||||
public class UploadsListFragment extends ExtendedListFragment {
|
||||
private static final String TAG = "LocalFileListFragment";
|
||||
public class UploadListFragment extends ExtendedListFragment {
|
||||
private static final String TAG = "UploadListFragment";
|
||||
|
||||
/**
|
||||
* Reference to the Activity which this fragment is attached to. For
|
||||
* callbacks
|
||||
*/
|
||||
private UploadsListFragment.ContainerActivity mContainerActivity;
|
||||
private UploadListFragment.ContainerActivity mContainerActivity;
|
||||
|
||||
/** Adapter to connect the data from the directory with the View object */
|
||||
private UploadsListAdapter mAdapter = null;
|
||||
private UploadListAdapter mAdapter = null;
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
|
|
@ -62,7 +62,7 @@ public class UploadsListFragment extends ExtendedListFragment {
|
|||
mContainerActivity = (ContainerActivity) activity;
|
||||
} catch (ClassCastException e) {
|
||||
throw new ClassCastException(activity.toString() + " must implement "
|
||||
+ UploadsListFragment.ContainerActivity.class.getSimpleName());
|
||||
+ UploadListFragment.ContainerActivity.class.getSimpleName());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -89,7 +89,7 @@ public class UploadsListFragment extends ExtendedListFragment {
|
|||
Log_OC.i(TAG, "onActivityCreated() start");
|
||||
|
||||
super.onActivityCreated(savedInstanceState);
|
||||
mAdapter = new UploadsListAdapter(getActivity());
|
||||
mAdapter = new UploadListAdapter(getActivity());
|
||||
setListAdapter(mAdapter);
|
||||
|
||||
Log_OC.i(TAG, "onActivityCreated() stop");
|
||||
|
|
@ -111,7 +111,7 @@ public class UploadsListFragment extends ExtendedListFragment {
|
|||
}
|
||||
|
||||
public void deselectAll() {
|
||||
mAdapter = new UploadsListAdapter(getActivity());
|
||||
mAdapter = new UploadListAdapter(getActivity());
|
||||
setListAdapter(mAdapter);
|
||||
}
|
||||
|
||||
|
|
@ -144,7 +144,7 @@ public class UploadsListFragment extends ExtendedListFragment {
|
|||
|
||||
/**
|
||||
* Returns the fule paths to the files checked by the user
|
||||
*
|
||||
*
|
||||
* @return File paths to the files checked by the user.
|
||||
*/
|
||||
public String[] getCheckedFilePaths() {
|
||||
|
|
@ -164,8 +164,8 @@ public class UploadsListFragment extends ExtendedListFragment {
|
|||
|
||||
/**
|
||||
* Interface to implement by any Activity that includes some instance of
|
||||
* UploadsListFragment
|
||||
*
|
||||
* UploadListFragment
|
||||
*
|
||||
* @author LukeOwncloud
|
||||
*/
|
||||
public interface ContainerActivity {
|
||||
|
|
@ -173,7 +173,7 @@ public class UploadsListFragment extends ExtendedListFragment {
|
|||
/**
|
||||
* Callback method invoked when an upload item is clicked by the user on
|
||||
* the upload list
|
||||
*
|
||||
*
|
||||
* @param file
|
||||
*/
|
||||
public void onUploadItemClick(File file);
|
||||
|
|
@ -181,7 +181,7 @@ public class UploadsListFragment extends ExtendedListFragment {
|
|||
/**
|
||||
* Callback method invoked when the parent activity is fully created to
|
||||
* get the filter which is to be applied to the upload list.
|
||||
*
|
||||
*
|
||||
* @return Filter to be applied. Can be null, then all uploads are
|
||||
* shown.
|
||||
*/
|
||||
Loading…
Reference in a new issue