about summary refs log tree commit diff stats
path: root/org.fox.ttrss/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java33
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java2
3 files changed, 18 insertions, 21 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index a0e223a7..89151353 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="550"
-    android:versionName="1.316">
+    android:versionCode="551"
+    android:versionName="1.317">
 
     <queries>
         <intent>
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java
index a3a9dd9e..ae8e7a4c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java
@@ -178,13 +178,11 @@ public class ImageCacheService extends IntentService {
 				.setDefaults(Notification.DEFAULT_ALL)
 				.setAutoCancel(true);
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			builder.setCategory(Notification.CATEGORY_MESSAGE)
-					.setVibrate(new long[0])
-					.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-					.setColor(0x88b0f0)
-					.setGroup("org.fox.ttrss");
-		}
+		builder.setCategory(Notification.CATEGORY_MESSAGE)
+				.setVibrate(new long[0])
+				.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+				.setColor(0x88b0f0)
+				.setGroup("org.fox.ttrss");
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 			builder.setChannelId(CommonActivity.NOTIFICATION_CHANNEL_PRIORITY);
@@ -214,19 +212,18 @@ public class ImageCacheService extends IntentService {
 
 		if (showProgress) builder.setProgress(max, progress, max == 0);
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			intent = new Intent(this, OnlineActivity.class);
-			intent.setAction(OfflineDownloadService.INTENT_ACTION_CANCEL);
+		intent = new Intent(this, OnlineActivity.class);
+		intent.setAction(OfflineDownloadService.INTENT_ACTION_CANCEL);
 
-			PendingIntent cancelIntent = PendingIntent.getActivity(this, OfflineDownloadService.PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE);
+		PendingIntent cancelIntent = PendingIntent.getActivity(this,
+				OfflineDownloadService.PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE);
 
-			builder.setCategory(Notification.CATEGORY_PROGRESS)
-					.setVibrate(new long[0])
-					.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
-					.setColor(0x88b0f0)
-					.setGroup("org.fox.ttrss")
-					.addAction(R.drawable.ic_launcher, getString(R.string.cancel), cancelIntent);
-		}
+		builder.setCategory(Notification.CATEGORY_PROGRESS)
+				.setVibrate(new long[0])
+				.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
+				.setColor(0x88b0f0)
+				.setGroup("org.fox.ttrss")
+				.addAction(R.drawable.ic_launcher, getString(R.string.cancel), cancelIntent);
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 			builder.setChannelId(CommonActivity.NOTIFICATION_CHANNEL_NORMAL);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
index b17a0db4..c86b3810 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
@@ -26,7 +26,7 @@ public class SmallWidgetProvider extends AppWidgetProvider {
         Log.d(TAG, "onUpdate");
 
         Intent intent = new Intent(context, OnlineActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
 
         RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_small);
         views.setOnClickPendingIntent(R.id.widget_main, pendingIntent);