Merge pull request #2466 from owncloud/release_2.10.0

Release 2.10.0

Author: davigonz

.github/release_template.md

@@ -7,7 +7,6 @@ AC:
  - [ ] [GIT] Create branch release_Y.Y.Y in owncloud/android-library from master  (almost feature-frozen)
  - [ ] [GIT] Create branch release_X.X.X in owncloud/android from master (almost feature-frozen)
  - [ ] [DEV] Update version number and name in AndroidManifest.xml in android module
- - [ ] [DEV] Update version number and name in AndroidManifest.xml in oc_jb_workaround module
  - [ ] [DIS] Create changelog file (< 500 chars) and add to CHANGELOG.md in owncloud/android
  - [ ] [QA] Design Test plan
  - [ ] [QA] Regression Test plan
@@ -24,7 +23,6 @@ AC:
  - [ ] [DIS] Update screenshots and store listing, if needed, in Blackberry World
  - [ ] [GIT] merge master branch into stable, in owncloud/android-library
  - [ ] [GIT] merge master branch into stable, in owncloud/android
- - [ ] [DIS] push OC JB workaround app to Play Store
  - [ ] [DOC] Update owncloud.org/download version numbers (notify rocketchat #marketing)
 
 

.gitignore

@@ -17,7 +17,6 @@ target/
 
 # Local configuration files (sdk path, etc)
 local.properties
-oc_workaround/local.properties
 oc_framework/local.properties
 oc_framework-test-project/local.properties
 tests/local.properties
@@ -28,7 +27,6 @@ lint.xml
 
 # Proguard README
 proguard-project.txt
-oc_workaround/proguard-project.txt
 oc_framework/proguard-project.txt
 oc_framework-test-project/proguard-project.txt
 tests/proguard-project.txt

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 2.10.0 (March 2018)
+- Android 9 (P) support (contribution)
+- Allow light filtering apps (optional)
+- Show additional info (user ID, email) when sharing with users with same display name
+- Support more options to enforce password when sharing publicly
+- Select all and inverse when uploading files (contribution)
+- Sorting options in sharing view (contribution)
+- Batched notifications for file deletions (contribution)
+- Commit hash in settings (contribution)
+- UI improvements, including:
+  + Disable log in button when credentials are empty (contribution)
+  + Warning to properly set camera folder in camera uploads
+- Bug fixes, including:
+  + Some camera upload issues in Android 9 (P) (contribution)
+  + Fix eye icon not visible to show/hide password in public shares (contribution)
+  + Fix welcome wizard rotation (contribution)
+
 ## 2.10.0 beta v1 (February 2018)
 - Android 9 (P) support (contribution)
 - Select all and inverse when uploading files (contribution)

doc/workaround_icon-hires.png

@@ -60,11 +60,11 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 19
         targetSdkVersion 28
 
-        versionCode = 20900400
-        versionName = "2.10.0-beta.1"
+        versionCode = 21000000
+        versionName = "2.10.0"
 
         buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
         buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""

doc/workaround_icon-playstore.png

@@ -191,12 +191,6 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/Theme.ownCloud.Authenticator">
-            <intent-filter>
-                <action android:name="com.owncloud.android.workaround.accounts.CREATE" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

doc/workaround_icon.svg

@@ -84,6 +84,9 @@
 import java.util.Map;
 import java.util.Vector;
 
+import static com.owncloud.android.operations.UploadFileOperation.CREATED_AS_CAMERA_UPLOAD_PICTURE;
+import static com.owncloud.android.operations.UploadFileOperation.CREATED_AS_CAMERA_UPLOAD_VIDEO;
+
 /**
  * Service for uploading files. Invoke using context.startService(...).
  *
@@ -282,28 +285,33 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         Log_OC.d(TAG, "Starting command with id " + startId);
 
         int createdBy = intent.getIntExtra(KEY_CREATED_BY, UploadFileOperation.CREATED_BY_USER);
-
+        boolean isCameraUploadFile =
+                createdBy == CREATED_AS_CAMERA_UPLOAD_PICTURE || createdBy == CREATED_AS_CAMERA_UPLOAD_VIDEO;
         boolean isAvailableOfflineFile = intent.getBooleanExtra(KEY_IS_AVAILABLE_OFFLINE_FILE, false);
         boolean isRequestedFromWifiBackEvent = intent.getBooleanExtra(
                 KEY_REQUESTED_FROM_WIFI_BACK_EVENT, false
         );
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if ((isCameraUploadFile || isAvailableOfflineFile || isRequestedFromWifiBackEvent) &&
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             /*
              * After calling startForegroundService method from {@link TransferRequester} for camera uploads or
              * available offline, we have to call this within five seconds after the service is created to avoid
              * an error
              */
             Log_OC.d(TAG, "Starting FileUploader service in foreground");
             mNotificationBuilder
-                    .setOngoing(true)
-                    .setSmallIcon(R.drawable.notification_icon)
-                    .setTicker(getString(R.string.uploader_upload_in_progress_ticker))
-                    .setContentTitle(getString(R.string.uploader_upload_in_progress_ticker))
-                    .setProgress(100, 0, false)
-                    .setContentText(String.format(getString(R.string.uploader_upload_in_progress_content), 0, ""))
                     .setChannelId(UPLOAD_NOTIFICATION_CHANNEL_ID)
-                    .setWhen(System.currentTimeMillis());
+                    .setSmallIcon(R.drawable.notification_icon);
+
+            if (isCameraUploadFile) {
+                mNotificationBuilder.setContentTitle(getString(R.string.uploader_upload_camera_upload_files));
+            } else if (isAvailableOfflineFile) {
+                mNotificationBuilder.setContentTitle(getString(R.string.uploader_upload_available_offline_files));
+            } else if (isRequestedFromWifiBackEvent) {
+                mNotificationBuilder.setContentTitle(getString(R.string.uploader_upload_requested_from_wifi_files));
+            }
+
             startForeground(141, mNotificationBuilder.build());
         }