From b6eb63a4721fcb739252d1cc5f155152a161bcce Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Tue, 9 Oct 2012 23:26:53 +0200 Subject: [PATCH] chaning photo taken name for more descriptive --- AndroidManifest.xml | 2 +- ...BroadcastReceiver.java => InstantUploadBroadcastReceiver.java} | 2 +- src/com/owncloud/android/files/services/FileUploader.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/com/owncloud/android/files/{PhotoTakenBroadcastReceiver.java => InstantUploadBroadcastReceiver.java} (99%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2db8ae89..ae536340 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -134,7 +134,7 @@ - + diff --git a/src/com/owncloud/android/files/PhotoTakenBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java similarity index 99% rename from src/com/owncloud/android/files/PhotoTakenBroadcastReceiver.java rename to src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index 1f93c4c7..f0c6004c 100644 --- a/src/com/owncloud/android/files/PhotoTakenBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -38,7 +38,7 @@ import android.provider.MediaStore.Images.Media; import android.util.Log; import android.webkit.MimeTypeMap; -public class PhotoTakenBroadcastReceiver extends BroadcastReceiver { +public class InstantUploadBroadcastReceiver extends BroadcastReceiver { public static String INSTANT_UPLOAD_DIR = "/InstantUpload/"; private static String TAG = "PhotoTakenBroadcastReceiver"; diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 4a849ebd..2abf92ed 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -11,7 +11,7 @@ import java.util.Vector; import com.owncloud.android.authenticator.AccountAuthenticator; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.files.PhotoTakenBroadcastReceiver; +import com.owncloud.android.files.InstantUploadBroadcastReceiver; import com.owncloud.android.operations.ChunkedUploadFileOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.UploadFileOperation; @@ -293,10 +293,10 @@ public class FileUploader extends Service implements OnDatatransferProgressListe */ private boolean createRemoteFolderForInstantUploads(WebdavClient client, FileDataStorageManager storageManager) { boolean result = true; - OCFile instantUploadDir = storageManager.getFileByPath(PhotoTakenBroadcastReceiver.INSTANT_UPLOAD_DIR); + OCFile instantUploadDir = storageManager.getFileByPath(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR); if (instantUploadDir == null) { - result = client.createDirectory(PhotoTakenBroadcastReceiver.INSTANT_UPLOAD_DIR); // fail could just mean that it already exists, but local database is not synchronized; the upload will be started anyway - OCFile newDir = new OCFile(PhotoTakenBroadcastReceiver.INSTANT_UPLOAD_DIR); + result = client.createDirectory(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR); // fail could just mean that it already exists, but local database is not synchronized; the upload will be started anyway + OCFile newDir = new OCFile(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR); newDir.setMimetype("DIR"); newDir.setParentId(storageManager.getFileByPath(OCFile.PATH_SEPARATOR).getFileId()); storageManager.saveFile(newDir); -- 2.11.0