From e8f4a3f0e941bc9da5dd17314a4a4fa03d4ca14e Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 13 Nov 2015 17:54:25 +0100 Subject: [PATCH] fix merge errors --- src/com/owncloud/android/files/services/FileUploader.java | 2 +- src/com/owncloud/android/ui/preview/PreviewMediaFragment.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 84c6adb5..9bc2742e 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -209,7 +209,7 @@ public class FileUploader extends Service } } // Cancel pending uploads - cancelUploadForAccount(account.name); + cancelUploadsForAccount(account); } if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE) diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index a047ab36..ba80ace6 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -27,6 +27,7 @@ import android.content.ActivityNotFoundException; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.media.MediaMetadataRetriever; +import android.net.Uri; import android.os.AsyncTask; import android.support.v7.app.AlertDialog; import android.content.ComponentName; -- 2.11.0