X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8215c5cc96ea095f8a1f1c90e70692e96ef7668f..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/src/com/owncloud/android/files/services/FileUploader.java diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index f38da6dc..5fa27511 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -267,13 +267,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe uploadKey = buildRemoteName(account, files[i].getRemotePath()); newUpload = new UploadFileOperation(account, files[i], chunked, isInstant, forceOverwrite, localAction, getApplicationContext()); -// if (chunked) { -// newUpload = new ChunkedUploadFileOperation(account, files[i], isInstant, forceOverwrite, -// localAction, getApplicationContext()); -// } else { -// newUpload = new UploadFileOperation(account, files[i], isInstant, forceOverwrite, localAction, -// getApplicationContext()); -// } if (isInstant) { newUpload.setRemoteFolderToBeCreated(); } @@ -794,6 +787,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, upload.getFile()); showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount()); + showDetailsIntent.putExtra(FileActivity.EXTRA_FROM_NOTIFICATION, true); showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), (int) System.currentTimeMillis(), showDetailsIntent, 0);