required fixes to bump target SDK to 31 / minimum SDK to 24

7 files changed, 29 insertions, 19 deletions

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index bda4f9ed..98b3552d 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -1,15 +1,20 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 31
+    buildToolsVersion "29.0.2"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         applicationId "org.fox.ttrss"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
         buildConfigField "boolean", "ENABLE_UPDATER", "false"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 24
+        targetSdkVersion 31
     }
 
     signingConfigs {
@@ -58,7 +63,7 @@ dependencies {
     implementation files('libs/glide-transformations-2.0.2.jar')
     implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
     implementation 'com.github.natario1:NestedScrollCoordinatorLayout:5a33a7dbd8'
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index d7ca70fe..b3c0b687 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
         <activity
             android:name=".LaunchActivity"
             android:label="@string/app_name"
+            android:exported="true"
             android:theme="@android:style/Theme.NoDisplay" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -68,6 +69,7 @@
         <activity
             android:name=".DetailActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -98,6 +100,7 @@
             android:name=".share.ShareActivity"
             android:excludeFromRecents="true"
             android:label="@string/app_name"
+            android:exported="true"
             android:theme="@style/DarkDialogTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -111,6 +114,7 @@
             android:name=".share.SubscribeActivity"
             android:excludeFromRecents="true"
             android:label="@string/subscribe_name"
+            android:exported="true"
             android:theme="@style/DarkDialogTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -222,13 +226,13 @@
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIwG6zsGB4qo6ZhjfwIJpm9WI7AqmWaoRXm6ZJnA" />
 
-        <receiver android:name=".util.DeviceBootReceiver">
+        <receiver android:name=".util.DeviceBootReceiver" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".widget.SmallWidgetProvider" >
+        <receiver android:name=".widget.SmallWidgetProvider" android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="org.fox.ttrss.WIDGET_FORCE_UPDATE" />
@@ -246,6 +250,7 @@
             android:name=".DashClock"
             android:icon="@drawable/dashclock"
             android:label="@string/app_name"
+            android:exported="true"
             android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA" >
             <intent-filter>
                 <action android:name="com.google.android.apps.dashclock.Extension" />
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index e8d00285..1933fe6a 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -468,7 +468,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 			Intent shareIntent = getShareIntent(uri.toString(), null);
 
 			PendingIntent pendingIntent = PendingIntent.getActivity(getApplicationContext(),
-					CommonActivity.PENDING_INTENT_CHROME_SHARE, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+					CommonActivity.PENDING_INTENT_CHROME_SHARE, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
 			builder.setActionButton(BitmapFactory.decodeResource(getResources(), R.drawable.ic_share),
 					getString(R.string.share_article), pendingIntent);
@@ -595,7 +595,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 		intentUpdate.setAction(SmallWidgetProvider.ACTION_REQUEST_UPDATE);
 
 		PendingIntent pendingIntentAlarm = PendingIntent.getBroadcast(context,
-				0, intentUpdate, PendingIntent.FLAG_UPDATE_CURRENT);
+				0, intentUpdate, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
 		alarmManager.cancel(pendingIntentAlarm);
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java
index ec1c353d..933fbc03 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java
@@ -109,7 +109,7 @@ public class OfflineDownloadService extends Service {
 		Intent intent = new Intent(this, OnlineActivity.class);
 		
 		PendingIntent contentIntent = PendingIntent.getActivity(this, PI_GENERIC,
-                intent, 0);
+                intent, PendingIntent.FLAG_IMMUTABLE);
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext())
                 .setContentText(msg)
@@ -129,7 +129,7 @@ public class OfflineDownloadService extends Service {
 			intent = new Intent(this, OnlineActivity.class);
 			intent.setAction(INTENT_ACTION_CANCEL);
 
-			PendingIntent cancelIntent = PendingIntent.getActivity(this, PI_CANCEL, intent, 0);
+			PendingIntent cancelIntent = PendingIntent.getActivity(this, PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE);
 
             builder.setCategory(Notification.CATEGORY_PROGRESS)
                     .setVibrate(new long[0])
@@ -155,7 +155,7 @@ public class OfflineDownloadService extends Service {
 		}
 
 		PendingIntent contentIntent = PendingIntent.getActivity(this, PI_SUCCESS,
-				intent, PendingIntent.FLAG_UPDATE_CURRENT);
+				intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
 		NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext())
 				.setContentIntent(contentIntent)
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java
index fb22cafd..cce355a1 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java
@@ -61,7 +61,7 @@ public class OfflineUploadService extends IntentService {
 	@SuppressWarnings("deprecation")
 	private void updateNotification(String msg, int progress, int max, boolean showProgress, boolean isError) {
 		PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-                new Intent(this, OnlineActivity.class), 0);
+                new Intent(this, OnlineActivity.class), PendingIntent.FLAG_IMMUTABLE);
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext())
                 .setContentText(msg)
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 24a7a732..a3a9dd9e 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
@@ -163,7 +163,7 @@ public class ImageCacheService extends IntentService {
 		intent.setAction(OfflineDownloadService.INTENT_ACTION_SWITCH_OFFLINE);
 
 		PendingIntent contentIntent = PendingIntent.getActivity(this, OfflineDownloadService.PI_SUCCESS,
-				intent, PendingIntent.FLAG_UPDATE_CURRENT);
+				intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
 		NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext())
 				.setContentTitle(getString(R.string.dialog_offline_success))
@@ -181,7 +181,7 @@ public class ImageCacheService extends IntentService {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			builder.setCategory(Notification.CATEGORY_MESSAGE)
 					.setVibrate(new long[0])
-					.setVisibility(Notification.VISIBILITY_PUBLIC)
+					.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
 					.setColor(0x88b0f0)
 					.setGroup("org.fox.ttrss");
 		}
@@ -199,7 +199,7 @@ public class ImageCacheService extends IntentService {
 		Intent intent = new Intent(this, OnlineActivity.class);
 
 		PendingIntent contentIntent = PendingIntent.getActivity(this, OfflineDownloadService.PI_GENERIC,
-                intent, 0);
+                intent, PendingIntent.FLAG_IMMUTABLE);
 
 		NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext())
 				.setContentText(msg)
@@ -218,11 +218,11 @@ public class ImageCacheService extends IntentService {
 			intent = new Intent(this, OnlineActivity.class);
 			intent.setAction(OfflineDownloadService.INTENT_ACTION_CANCEL);
 
-			PendingIntent cancelIntent = PendingIntent.getActivity(this, OfflineDownloadService.PI_CANCEL, intent, 0);
+			PendingIntent cancelIntent = PendingIntent.getActivity(this, OfflineDownloadService.PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE);
 
 			builder.setCategory(Notification.CATEGORY_PROGRESS)
 					.setVibrate(new long[0])
-					.setVisibility(Notification.VISIBILITY_PUBLIC)
+					.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
 					.setColor(0x88b0f0)
 					.setGroup("org.fox.ttrss")
 					.addAction(R.drawable.ic_launcher, getString(R.string.cancel), cancelIntent);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
index a38451b0..b9ec704e 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
@@ -196,7 +196,7 @@ public class WidgetUpdateService extends JobIntentService {
     private void updateWidgetsText(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, int unread, int resultCode) {
 
         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);