Merge pull request #2062 from owncloud/drop_instant_uploads

Drop instant uploads in favour of camera uploads [WIP]

AndroidManifest.xml

@@ -17,9 +17,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.owncloud.android"
-    android:versionCode="${versionCode}"
-    android:versionName="${versionName}">
+          package="com.owncloud.android"
+          android:versionCode="${versionCode}"
+          android:versionName="${versionName}">
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -142,6 +142,12 @@
             android:exported="true">
         </service>
 
+        <service
+            android:name=".files.services.CameraUploadsSyncJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="true">
+        </service>
+
         <provider
             android:name=".providers.FileContentProvider"
             android:authorities="@string/authority"
@@ -227,19 +233,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".broadcastreceivers.InstantUploadBroadcastReceiver">
-            <intent-filter>
-                <action android:name="android.hardware.action.NEW_PICTURE" />
-
-                <data android:mimeType="image/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.hardware.action.NEW_VIDEO" />
-
-                <data android:mimeType="video/*" />
-            </intent-filter>
-        </receiver>
-
         <service android:name=".services.observer.FileObserverService" />
 
         <activity

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.5.1 beta v1 (November 2017)
+- Camera uploads (replacing instant uploads)
+- Android O support
+- Notification channels (Android O required)
+- Private link (OC X required)
+- Fixed typos in some translations
+
 ## 2.5.0 (October 2017)
 - OAuth2 support
 - Show file listing option (anonymous upload) when sharing a folder (OC X required)

build.gradle

@@ -40,7 +40,7 @@ configurations.all {
 
 dependencies {
     /// dependencies for app building
-    compile name: 'touch-image-view'
+    compile project(':touchImageView')
     compile project(':owncloud-android-library')
     compile "com.android.support:support-v4:${supportLibraryVersion}"
     compile "com.android.support:design:${supportLibraryVersion}"
@@ -73,7 +73,6 @@ dependencies {
 
     // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
     androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
-
 }
 
 tasks.withType(Test) {
@@ -195,9 +194,8 @@ android {
         }
 
         beta {
-
-            manifestPlaceholders.versionCode = "20400001"
-            manifestPlaceholders.versionName = "2.5.0-beta.2"
+            manifestPlaceholders.versionCode = "20500001"
+            manifestPlaceholders.versionName = "2.5.1-beta.1"
             applicationIdSuffix ".beta"
 
             if (System.env.OC_BETA_KEYSTORE) {

res/layout/upload_list_item.xml

@@ -100,7 +100,7 @@
             android:textColor="@color/list_item_lastmod_and_filesize_text"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:text="@string/instant_upload_path"
+            android:text="@string/camera_upload_path"
             android:textSize="12dip"/>
 
     </LinearLayout>

res/values-af-rZA/strings.xml

@@ -30,8 +30,8 @@
   <string name="prefs_accounts">Rekeninge</string>
   <string name="prefs_manage_accounts">Bestuur rekeninge</string>
   <string name="prefs_passcode">Wagkodeslot</string>
-  <string name="prefs_instant_upload">Kitsbeeldoplaai</string>
-  <string name="prefs_instant_upload_summary">Laai kamerabeelde in ’n japtrap op</string>
+  <string name="prefs_camera_picture_upload">Kitsbeeldoplaai</string>
+  <string name="prefs_camera_picture_upload_summary">Laai kamerabeelde in ’n japtrap op</string>
   <string name="prefs_help">Hulp</string>
   <string name="prefs_feedback">Terugvoer</string>
   <string name="prefs_imprint">Afdruk</string>
@@ -82,7 +82,7 @@
   <string name="ssl_validator_btn_details_see">Details</string>
   <string name="ssl_validator_label_C">Land:</string>
   <string name="ssl_validator_label_L">Ligging:</string>
-  <string name="prefs_instant_upload_path_title">Oplaaipad</string>
+  <string name="prefs_camera_picture_upload_path_title">Oplaaipad</string>
   <string name="share_link_password_title">Voer ’n wagwoord in</string>
   <string name="share_link_empty_password">U moet ’n wagwoord invoer</string>
   <string name="activity_chooser_send_file_title">Stuur</string>

res/values-ar/strings.xml

@@ -30,10 +30,10 @@
   <string name="prefs_accounts">حسابات</string>
   <string name="prefs_manage_accounts">إدارة الحسابات</string>
   <string name="prefs_passcode">الرقم السري</string>
-  <string name="prefs_instant_upload">رفع الصورة مباشرة</string>
-  <string name="prefs_instant_upload_summary">رفع صورة المؤخذة عبر الكاميرا</string>
-  <string name="prefs_instant_video_upload">رفع فيديو مباشرة</string>
-  <string name="prefs_instant_video_upload_summary">رفع فيديو مباشرة من الكاميرا</string>
+  <string name="prefs_camera_picture_upload">رفع الصورة مباشرة</string>
+  <string name="prefs_camera_picture_upload_summary">رفع صورة المؤخذة عبر الكاميرا</string>
+  <string name="prefs_camera_video_upload">رفع فيديو مباشرة</string>
+  <string name="prefs_camera_video_upload_summary">رفع فيديو مباشرة من الكاميرا</string>
   <string name="prefs_log_summary">يستخدم هذا لتسجيل المشاكل</string>
   <string name="prefs_log_summary_history">هذا يعرض السجلات المسجلة</string>
   <string name="prefs_help">المساعدة</string>
@@ -241,7 +241,7 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 مساء</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="camera_upload_path">/InstantUpload</string>
   <string name="conflict_keep_both">الاحتفاظ بالنسختين</string>
   <string name="preview_image_description">معاينة الصورة</string>
   <string name="preview_image_error_unknown_format">لا يمكن عرض هذه الصورة</string>

res/values-az/strings.xml

@@ -20,10 +20,10 @@
   <string name="prefs_category_general">Ümumi</string>
   <string name="prefs_category_more">Daha da</string>
   <string name="prefs_accounts">Hesablar</string>
-  <string name="prefs_instant_upload">Ani şəkil yükləmələri</string>
-  <string name="prefs_instant_upload_summary">Kamera vasitəsi ilə götürülmüş şəkillərin tez yüklənməsi</string>
-  <string name="prefs_instant_video_upload">Ani video yükləmələri</string>
-  <string name="prefs_instant_video_upload_summary">Kamera vasitəsi ilə yazılmış videoların tez yüklənməsi</string>
+  <string name="prefs_camera_picture_upload">Ani şəkil yükləmələri</string>
+  <string name="prefs_camera_picture_upload_summary">Kamera vasitəsi ilə götürülmüş şəkillərin tez yüklənməsi</string>
+  <string name="prefs_camera_video_upload">Ani video yükləmələri</string>
+  <string name="prefs_camera_video_upload_summary">Kamera vasitəsi ilə yazılmış videoların tez yüklənməsi</string>
   <string name="prefs_log_summary">Bu problemlərin jurnal edilməsi üçün istifadə edilir</string>
   <string name="prefs_log_summary_history">Bu, yazılmış jurnalları göstərir</string>
   <string name="prefs_help">Kömək</string>
@@ -196,7 +196,7 @@ Aşağıda göstərilən %5$s-də olan daxili və xarici fayl(lar) link edilmiş
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_path">/CəldYükləmə</string>
+  <string name="camera_upload_path">/CəldYükləmə</string>
   <string name="conflict_keep_both">Birlikdə saxla</string>
   <string name="preview_image_description">Şəkili göstər</string>
   <string name="preview_image_error_unknown_format">Bu şəkil göstərilə bilməz</string>

res/values-bg-rBG/strings.xml

@@ -30,10 +30,10 @@
   <string name="prefs_accounts">Профили</string>
   <string name="prefs_manage_accounts">Управление на профилите</string>
   <string name="prefs_passcode">Заключваща парола</string>
-  <string name="prefs_instant_upload">Незабавно качване на снимки</string>
-  <string name="prefs_instant_upload_summary">Незабвано качване на снимки направени с камерата</string>
-  <string name="prefs_instant_video_upload">Незабавно качване на видео</string>
-  <string name="prefs_instant_video_upload_summary">Незабавно качване на видеота записани от камерата.</string>
+  <string name="prefs_camera_picture_upload">Незабавно качване на снимки</string>
+  <string name="prefs_camera_picture_upload_summary">Незабвано качване на снимки направени с камерата</string>
+  <string name="prefs_camera_video_upload">Незабавно качване на видео</string>
+  <string name="prefs_camera_video_upload_summary">Незабавно качване на видеота записани от камерата.</string>
   <string name="prefs_log_title">Разреши влизане</string>
   <string name="prefs_log_summary">Използва се за докладване на проблеми</string>
   <string name="prefs_log_title_history">История на влизанията</string>
@@ -284,9 +284,9 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_on_wifi">Качване на снимки само през WiFi</string>
-  <string name="instant_video_upload_on_wifi">Качване на видео само през WiFi</string>
-  <string name="instant_upload_path">/InstantUpload</string>
+  <string name="camera_picture_upload_on_wifi">Качване на снимки само през WiFi</string>
+  <string name="camera_video_upload_on_wifi">Качване на видео само през WiFi</string>
+  <string name="camera_upload_path">/InstantUpload</string>
   <string name="conflict_title">Файлов конфликт</string>
   <string name="conflict_message">Кои файлове искаш за да запазиш? Ако избереш и двете версии, локалния файл ще има цифри добавени към името си.</string>
   <string name="conflict_keep_both">Запазване и на двата</string>
@@ -295,7 +295,7 @@
   <string name="preview_image_description">Преглед на изображението</string>
   <string name="preview_image_error_unknown_format">Изображението не може да бъде показано</string>
   <string name="error__upload__local_file_not_copied">%1$s не може да бъде копиран в локалната папка %2$s</string>
-  <string name="prefs_instant_upload_path_title">Път за качване</string>
+  <string name="prefs_camera_picture_upload_path_title">Път за качване</string>
   <string name="share_link_no_support_share_api">За съжаление споделянето не е включено на сървъра ви. 
 Моля, свържете се с администратора.</string>
   <string name="share_link_file_no_exist">Неуспешен опит за споделяне. Моля, провери дали файла съществува.</string>
@@ -348,9 +348,9 @@
   <string name="copy_file_invalid_overwrite">Файлът вече съществува в отдалечената папка.</string>
   <string name="copy_file_error">Настъпи грешка при опита за копиране на този файл или папка.</string>
   <string name="forbidden_permissions_copy">да копира този файл</string>
-  <string name="prefs_category_instant_uploading">Незабавно качване</string>
+  <string name="prefs_category_camera_upload">Незабавно качване</string>
   <string name="prefs_category_details">Подробности</string>
-  <string name="prefs_instant_video_upload_path_title">Път за качване на видеа</string>
+  <string name="prefs_camera_video_upload_path_title">Път за качване на видеа</string>
   <string name="sync_folder_failed_content">Синхронизацията на папка %1$s не може да бъде завършена.</string>
   <string name="shared_subject_header">споделен</string>
   <string name="with_you_subject_header">с теб</string>
@@ -368,11 +368,11 @@
   <string name="file_list__footer__files">%1$d файла</string>
   <string name="file_list__footer__files_and_folder">%1$d файла, 1 папка</string>
   <string name="file_list__footer__files_and_folders">%1$d файла, %2$d папки</string>
-  <string name="prefs_instant_upload_source_path_title">Папка за камерата (%1$s)</string>
-  <string name="prefs_instant_upload_source_path_title_required">задължителен</string>
-  <string name="prefs_instant_upload_source_path_title_optional">по избор</string>
-  <string name="prefs_instant_behaviour_dialogTitle">Оригиналният файл ще бъде...</string>
-  <string name="prefs_instant_behaviour_title">Оригиналният файл ще бъде...</string>
+  <string name="prefs_camera_upload_source_path_title">Папка за камерата (%1$s)</string>
+  <string name="prefs_camera_upload_source_path_title_required">задължителен</string>
+  <string name="prefs_camera_upload_source_path_title_optional">по избор</string>
+  <string name="prefs_camera_upload_behaviour_dialogTitle">Оригиналният файл ще бъде...</string>
+  <string name="prefs_camera_upload_behaviour_title">Оригиналният файл ще бъде...</string>
   <string name="upload_copy_files">Копиране на файл</string>
   <string name="upload_move_files">Преместване на файл</string>
   <string name="pref_behaviour_entries_keep_file">запази в оригиналната папка</string>

res/values-bn-rBD/strings.xml

@@ -18,10 +18,10 @@
   <string name="prefs_category_general">সাধারণ</string>
   <string name="prefs_category_more">বেশী</string>
   <string name="prefs_accounts">একাউন্ট</string>
-  <string name="prefs_instant_upload">দ্রুত ছবি আপলোড</string>
-  <string name="prefs_instant_upload_summary">ক্যামেরা থেকে তোলা ছবি তৎক্ষণাৎ আপলোড</string>
-  <string name="prefs_instant_video_upload">দ্রুত ভিডিও আপলোড</string>
-  <string name="prefs_instant_video_upload_summary">ক্যামেরায় রেকর্ড করা ভিডিও তৎক্ষণাৎ আপলোড</string>
+  <string name="prefs_camera_picture_upload">দ্রুত ছবি আপলোড</string>
+  <string name="prefs_camera_picture_upload_summary">ক্যামেরা থেকে তোলা ছবি তৎক্ষণাৎ আপলোড</string>
+  <string name="prefs_camera_video_upload">দ্রুত ভিডিও আপলোড</string>
+  <string name="prefs_camera_video_upload_summary">ক্যামেরায় রেকর্ড করা ভিডিও তৎক্ষণাৎ আপলোড</string>
   <string name="prefs_log_summary">সমস্যা তালিকাভুক্ত করার জায়গা</string>
   <string name="prefs_log_summary_history">রেকর্ডেড লগ এখানে দেখেন</string>
   <string name="prefs_help">সহায়িকা</string>
@@ -183,7 +183,7 @@
   <string name="placeholder_filesize">৩৮৯ কেবি</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_path">/তাৎক্ষণিক আপলোড</string>
+  <string name="camera_upload_path">/তাৎক্ষণিক আপলোড</string>
   <string name="conflict_keep_both">উভয়কে রাখ</string>
   <string name="preview_image_description">ছবি প্রাকদর্শন</string>
   <string name="preview_image_error_unknown_format">ছবিটি প্রদর্শন করা যাবেনা</string>