projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'setup_colors' into setup_app_name
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
FileDisplayActivity.java
diff --git
a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index
6bacaab
..
e66ab60
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@
-58,8
+58,8
@@
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window;
import com.owncloud.android.Log_OC;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window;
import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.datamodel.DataStorageManager;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.datamodel.DataStorageManager;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@@
-137,6
+137,9
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
private OCFile mWaitingToPreview;
private Handler mHandler;
private OCFile mWaitingToPreview;
private Handler mHandler;
+
+ private String mDownloadAddedMessage;
+ private String mDownloadFinishMessage;
@Override
protected void onCreate(Bundle savedInstanceState) {
@Override
protected void onCreate(Bundle savedInstanceState) {
@@
-146,6
+149,10
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
mHandler = new Handler();
super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
mHandler = new Handler();
+
+ FileDownloader downloader = new FileDownloader();
+ mDownloadAddedMessage = downloader.getDownloadAddedMessage();
+ mDownloadFinishMessage= downloader.getDownloadFinishMessage();
/// bindings to transference services
mUploadConnection = new ListServiceConnection();
/// bindings to transference services
mUploadConnection = new ListServiceConnection();
@@
-187,6
+194,8
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to work around 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");
}
Log_OC.d(TAG, "onCreate() end");
}
@@
-397,12
+406,12
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
// the user browsed to other file ; forget the automatic preview
mWaitingToPreview = null;
// the user browsed to other file ; forget the automatic preview
mWaitingToPreview = null;
- } else if (downloadEvent.equals(
FileDownloader.DOWNLOAD_ADDED_MESSAGE
)) {
+ } else if (downloadEvent.equals(
mDownloadAddedMessage
)) {
// grant that the right panel updates the progress bar
detailsFragment.listenForTransferProgress();
detailsFragment.updateFileDetails(true, false);
// grant that the right panel updates the progress bar
detailsFragment.listenForTransferProgress();
detailsFragment.updateFileDetails(true, false);
- } else if (downloadEvent.equals(
FileDownloader.DOWNLOAD_FINISH_MESSAGE
)) {
+ } else if (downloadEvent.equals(
mDownloadFinishMessage
)) {
// update the right panel
boolean detailsFragmentChanged = false;
if (waitedPreview) {
// update the right panel
boolean detailsFragmentChanged = false;
if (waitedPreview) {
@@
-470,12
+479,12
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
}
private void startSynchronization() {
}
private void startSynchronization() {
- ContentResolver.cancelSync(null,
AccountAuthenticator.AUTHORITY
); // cancel the current synchronizations of any ownCloud account
+ ContentResolver.cancelSync(null,
MainApp.getAuthTokenType()
); // cancel the current synchronizations of any ownCloud account
Bundle bundle = new Bundle();
bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
ContentResolver.requestSync(
getAccount(),
Bundle bundle = new Bundle();
bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
ContentResolver.requestSync(
getAccount(),
-
AccountAuthenticator.AUTHORITY
, bundle);
+
MainApp.getAuthTokenType()
, bundle);
}
}
@@
-620,19
+629,22
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
super.onResume();
Log_OC.e(TAG, "onResume() start");
super.onResume();
Log_OC.e(TAG, "onResume() start");
+ FileUploader fileUploader = new FileUploader();
+ FileSyncService fileSyncService = new FileSyncService();
+
// Listen for sync messages
// Listen for sync messages
- IntentFilter syncIntentFilter = new IntentFilter(
FileSyncService.SYNC_MESSAGE
);
+ IntentFilter syncIntentFilter = new IntentFilter(
fileSyncService.getSyncMessage()
);
mSyncBroadcastReceiver = new SyncBroadcastReceiver();
registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
// Listen for upload messages
mSyncBroadcastReceiver = new SyncBroadcastReceiver();
registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
// Listen for upload messages
- IntentFilter uploadIntentFilter = new IntentFilter(
FileUploader.UPLOAD_FINISH_MESSAGE
);
+ IntentFilter uploadIntentFilter = new IntentFilter(
fileUploader.getUploadFinishMessage()
);
mUploadFinishReceiver = new UploadFinishReceiver();
registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
// Listen for download messages
mUploadFinishReceiver = new UploadFinishReceiver();
registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
// Listen for download messages
- IntentFilter downloadIntentFilter = new IntentFilter(
FileDownloader.DOWNLOAD_ADDED_MESSAGE
);
- downloadIntentFilter.addAction(
FileDownloader.DOWNLOAD_FINISH_MESSAGE
);
+ IntentFilter downloadIntentFilter = new IntentFilter(
mDownloadAddedMessage
);
+ downloadIntentFilter.addAction(
mDownloadFinishMessage
);
mDownloadFinishReceiver = new DownloadFinishReceiver();
registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
mDownloadFinishReceiver = new DownloadFinishReceiver();
registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
@@
-1328,7
+1340,7
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
// Create directory
path += newDirectoryName + OCFile.PATH_SEPARATOR;
// Create directory
path += newDirectoryName + OCFile.PATH_SEPARATOR;
- RemoteOperation operation = new CreateFolderOperation(path,
getCurrentDir().getFileId()
, mStorageManager);
+ RemoteOperation operation = new CreateFolderOperation(path,
false
, mStorageManager);
operation.execute( getAccount(),
FileDisplayActivity.this,
FileDisplayActivity.this,
operation.execute( getAccount(),
FileDisplayActivity.this,
FileDisplayActivity.this,