Fix Android O compatibility (#33)

* Update Cloudinary and Evernote dependencies
* Use new notification API
* Fix launch-mode bug for older Android versions.

Author: nitzanj

gradle.properties

@@ -14,6 +14,6 @@ [email protected]
 # These two properties must use these exact names to be compatible with 'gradle install' plugin.
 group=com.cloudinary
 version=1.20.0
-cloudinaryLibsVersion=1.14.0
-androidSupportVersion=25.4.0
+cloudinaryLibsVersion=1.16.0
+androidSupportVersion=26.0.1
 org.gradle.jvmargs=-Xmx1024m

lib/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
 
@@ -39,7 +39,7 @@ android {
 dependencies {
     compile "com.cloudinary:cloudinary-core:${cloudinaryLibsVersion}"
     compile "com.android.support:support-core-utils:${androidSupportVersion}"
-    compile 'com.evernote:android-job:1.1.8'
+    compile 'com.evernote:android-job:1.2.0'
     testCompile 'junit:junit:4.12'
     testCompile "com.cloudinary:cloudinary-test-common:${cloudinaryLibsVersion}"
     androidTestCompile 'org.awaitility:awaitility:3.0.0'

lib/src/main/java/com/cloudinary/android/AndroidJobStrategy.java

@@ -36,7 +36,6 @@ static JobRequest adapt(UploadRequest request) {
                 .setBackoffCriteria(policy.getBackoffMillis(), adaptPolicy(policy.getBackoffPolicy()))
                 .setRequiresCharging(policy.isRequiresCharging())
                 .setRequiresDeviceIdle(policy.isRequiresIdle())
-                .setPersisted(true)
                 .setExtras(extras)
                 .setRequirementsEnforced(true)
                 .build();

sample-signed/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "com.cloudinary.android.sample.signed"
         minSdkVersion 19
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

sample/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "com.cloudinary.android.sample"
         minSdkVersion 19
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

sample/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity
             android:name=".app.MainActivity"
             android:label="@string/app_name"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

sample/src/main/java/com/cloudinary/android/sample/app/CloudinaryService.java

@@ -48,6 +48,7 @@ public void onCreate() {
         builder = new NotificationCompat.Builder(this);
         builder.setContentTitle("Uploading to Cloudinary...")
                 .setSmallIcon(R.drawable.ic_launcher)
+                .setChannelId(MainApplication.NOTIFICATION_CHANNEL_ID)
                 .setContentIntent(PendingIntent.getActivity(this, 999,
                         new Intent(this, MainActivity.class).addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT).setAction(ACTION_STATE_IN_PROGRESS),
                         0))
@@ -68,6 +69,7 @@ private android.support.v4.app.NotificationCompat.Builder getBuilder(String requ
         return new NotificationCompat.Builder(this)
                 .setSmallIcon(R.drawable.ic_launcher)
                 .setAutoCancel(true)
+                .setChannelId(MainApplication.NOTIFICATION_CHANNEL_ID)
                 .setContentIntent(PendingIntent.getActivity(this, 1234,
                         new Intent(this, MainActivity.class)
                                 .setAction(actionFromStatus(status))

sample/src/main/java/com/cloudinary/android/sample/app/MainApplication.java

@@ -2,15 +2,21 @@
 
 
 import android.app.Application;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 
 import com.cloudinary.android.LogLevel;
 import com.cloudinary.android.MediaManager;
 import com.cloudinary.android.policy.GlobalUploadPolicy;
 import com.cloudinary.android.policy.UploadPolicy;
+import com.cloudinary.android.sample.R;
 
 public class MainApplication extends Application {
+    public static final String NOTIFICATION_CHANNEL_ID = "CLOUDINARY_CHANNEL";
     static MainApplication _instance;
     private Handler mainThreadHandler;
 
@@ -36,9 +42,24 @@ public void onCreate() {
                         .networkPolicy(UploadPolicy.NetworkType.ANY)
                         .build());
 
+        createNotificationChannel();
+
         _instance = this;
     }
 
+    private void createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            CharSequence name = getString(R.string.channel_name);
+            String description = getString(R.string.channel_description);
+            int importance = NotificationManager.IMPORTANCE_DEFAULT;
+            NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance);
+            channel.setDescription(description);
+            channel.setVibrationPattern(new long[]{});
+            NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
+
     public void runOnMainThread(Runnable runnable) {
         mainThreadHandler.post(runnable);
     }

sample/src/main/res/values/strings.xml

@@ -73,4 +73,6 @@
     <string name="effect_video_name_reverse">Reverse</string>
     <string name="open_url">Open url</string>
     <string name="request_cancelled">Request cancelled successfully</string>
+    <string name="channel_name">Cloudinary</string>
+    <string name="channel_description">Notifications regarding progress and status updates for Cloudinary resources</string>
 </resources>