|
@@ -42,6 +42,7 @@ import android.os.IBinder;
|
|
|
import android.preference.PreferenceManager;
|
|
|
import android.provider.MediaStore;
|
|
|
import android.support.v4.app.Fragment;
|
|
|
+import android.support.v4.app.FragmentManager;
|
|
|
import android.support.v4.app.FragmentTransaction;
|
|
|
import android.util.Log;
|
|
|
import android.view.View;
|
|
@@ -77,6 +78,7 @@ import com.owncloud.android.operations.SynchronizeFileOperation;
|
|
|
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
|
|
|
import com.owncloud.android.syncadapter.FileSyncService;
|
|
|
import com.owncloud.android.ui.dialog.EditNameDialog;
|
|
|
+import com.owncloud.android.ui.dialog.LoadingDialog;
|
|
|
import com.owncloud.android.ui.dialog.SslValidatorDialog;
|
|
|
import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
|
|
|
import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
|
|
@@ -120,6 +122,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1;
|
|
|
private static final int DIALOG_SSL_VALIDATOR = 2;
|
|
|
private static final int DIALOG_CERT_NOT_SAVED = 3;
|
|
|
+
|
|
|
+ private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
|
|
|
|
|
|
public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS";
|
|
|
|
|
@@ -608,6 +612,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
|
|
|
Log_OC.d(TAG, "onSaveInstanceState() end");
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
protected void onResume() {
|
|
@@ -746,6 +752,30 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * Show loading dialog
|
|
|
+ */
|
|
|
+ public void showLoadingDialog() {
|
|
|
+ // Construct dialog
|
|
|
+ LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
|
|
|
+ FragmentManager fm = getSupportFragmentManager();
|
|
|
+ FragmentTransaction ft = fm.beginTransaction();
|
|
|
+ loading.show(ft, DIALOG_WAIT_TAG);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Dismiss loading dialog
|
|
|
+ */
|
|
|
+ public void dismissLoadingDialog(){
|
|
|
+ Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
|
|
|
+ if (frag != null) {
|
|
|
+ LoadingDialog loading = (LoadingDialog) frag;
|
|
|
+ loading.dismiss();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* Translates a content URI of an image to a physical path
|
|
|
* on the disk
|
|
@@ -1156,7 +1186,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
* @param result Result of the removal.
|
|
|
*/
|
|
|
private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {
|
|
|
- dismissDialog(DIALOG_SHORT_WAIT);
|
|
|
+ dismissLoadingDialog();
|
|
|
if (result.isSuccess()) {
|
|
|
Toast msg = Toast.makeText(this, R.string.remove_success_msg, Toast.LENGTH_LONG);
|
|
|
msg.show();
|
|
@@ -1188,11 +1218,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
*/
|
|
|
private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {
|
|
|
if (result.isSuccess()) {
|
|
|
- dismissDialog(DIALOG_SHORT_WAIT);
|
|
|
+ dismissLoadingDialog();
|
|
|
refeshListOfFilesFragment();
|
|
|
|
|
|
} else {
|
|
|
- dismissDialog(DIALOG_SHORT_WAIT);
|
|
|
+ //dismissDialog(DIALOG_SHORT_WAIT);
|
|
|
+ dismissLoadingDialog();
|
|
|
try {
|
|
|
Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG);
|
|
|
msg.show();
|
|
@@ -1212,7 +1243,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
* @param result Result of the renaming.
|
|
|
*/
|
|
|
private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOperationResult result) {
|
|
|
- dismissDialog(DIALOG_SHORT_WAIT);
|
|
|
+ dismissLoadingDialog();
|
|
|
OCFile renamedFile = operation.getFile();
|
|
|
if (result.isSuccess()) {
|
|
|
if (mDualPane) {
|
|
@@ -1243,7 +1274,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
|
|
|
|
|
|
private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {
|
|
|
- dismissDialog(DIALOG_SHORT_WAIT);
|
|
|
+ dismissLoadingDialog();
|
|
|
OCFile syncedFile = operation.getLocalFile();
|
|
|
if (!result.isSuccess()) {
|
|
|
if (result.getCode() == ResultCode.SYNC_CONFLICT) {
|
|
@@ -1304,7 +1335,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|
|
mHandler,
|
|
|
FileDisplayActivity.this);
|
|
|
|
|
|
- showDialog(DIALOG_SHORT_WAIT);
|
|
|
+ showLoadingDialog();
|
|
|
}
|
|
|
}
|
|
|
}
|