diff options
8 files changed, 73 insertions, 29 deletions
diff --git a/app/build.gradle b/app/build.gradle index edb9d8ae5..f556eacc3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 31 + buildToolsVersion "31.0.0" defaultConfig { applicationId "it.niedermann.nextcloud.deck" minSdkVersion 22 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 1019004 versionName "1.19.4" vectorDrawables.useSupportLibrary true @@ -71,16 +71,16 @@ dependencies { // Android X implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.camera:camera-camera2:1.1.0-alpha08' - implementation 'androidx.camera:camera-lifecycle:1.1.0-alpha08' - implementation 'androidx.camera:camera-view:1.0.0-alpha28' + implementation 'androidx.camera:camera-camera2:1.1.0-alpha09' + implementation 'androidx.camera:camera-lifecycle:1.1.0-alpha09' + implementation 'androidx.camera:camera-view:1.0.0-alpha29' implementation 'androidx.constraintlayout:constraintlayout:2.1.1' implementation 'androidx.preference:preference:1.1.1' def roomVersion = "2.3.0" implementation "androidx.room:room-runtime:$roomVersion" annotationProcessor "androidx.room:room-compiler:$roomVersion" implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.work:work-runtime:2.6.0' + implementation 'androidx.work:work-runtime:2.7.0-rc01' implementation "com.google.android.material:material:$rootProject.materialVersion" // Glide diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7e94eff17..986cef205 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,7 +45,8 @@ <activity android:name=".ui.MainActivity" android:label="@string/app_name_short" - android:theme="@style/SplashTheme"> + android:theme="@style/SplashTheme" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -77,7 +78,8 @@ <activity android:name=".ui.sharetarget.ShareTargetActivity" android:label="@string/share_add_to_card" - android:theme="@style/SplashTheme"> + android:theme="@style/SplashTheme" + android:exported="false"> <intent-filter> <action android:name="android.intent.action.SEND" /> @@ -129,7 +131,8 @@ <activity android:name=".ui.preparecreate.PrepareCreateActivity" android:description="@string/add_a_new_card_using_the_button" - android:label="@string/add_card"> + android:label="@string/add_card" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.SEND" /> @@ -145,7 +148,8 @@ <activity android:name=".ui.PushNotificationActivity" - android:label="@string/app_name"> + android:label="@string/app_name" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> </intent-filter> @@ -174,7 +178,8 @@ <receiver android:name="it.niedermann.nextcloud.deck.ui.widget.upcoming.UpcomingWidget" - android:label="@string/widget_upcoming_title"> + android:label="@string/widget_upcoming_title" + android:exported="true"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> @@ -185,7 +190,8 @@ android:resource="@xml/upcoming_widget_provider" /> </receiver> - <activity android:name=".ui.widget.stack.StackWidgetConfigurationActivity"> + <activity android:name=".ui.widget.stack.StackWidgetConfigurationActivity" + android:exported="true"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" /> </intent-filter> @@ -193,7 +199,8 @@ <receiver android:name="it.niedermann.nextcloud.deck.ui.widget.stack.StackWidget" - android:label="@string/widget_stack_title"> + android:label="@string/widget_stack_title" + android:exported="true"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> @@ -209,7 +216,8 @@ android:description="@string/add_a_new_card_using_the_button" android:icon="@drawable/ic_app_logo" android:label="@string/add_card" - android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"> + android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" + android:exported="true"> <intent-filter> <action android:name="android.service.quicksettings.action.QS_TILE" /> </intent-filter> @@ -222,7 +230,8 @@ <activity android:name=".ui.widget.singlecard.SelectCardForWidgetActivity" android:label="@string/share_add_to_card" - android:theme="@style/SplashTheme"> + android:theme="@style/SplashTheme" + android:exported="true"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" /> @@ -235,7 +244,8 @@ <receiver android:name=".ui.widget.singlecard.SingleCardWidget" - android:label="@string/single_card"> + android:label="@string/single_card" + android:exported="true"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> </intent-filter> diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java index b3e4d622b..bdfd111d0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java @@ -1,5 +1,7 @@ package it.niedermann.nextcloud.deck.ui.widget.singlecard; +import static it.niedermann.nextcloud.deck.util.WidgetUtil.pendingIntentFlagCompat; + import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -38,7 +40,7 @@ public class SingleCardWidget extends AppWidgetProvider { final FullSingleCardWidgetModel fullModel = syncManager.getSingleCardWidgetModelDirectly(appWidgetId); final Intent intent = EditActivity.createEditCardIntent(context, fullModel.getAccount(), fullModel.getModel().getBoardId(), fullModel.getFullCard().getLocalId()); - final PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT); + final PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, pendingIntentFlagCompat(PendingIntent.FLAG_UPDATE_CURRENT)); final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_single_card); final Intent serviceIntent = new Intent(context, SingleCardWidgetService.class); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java index 02d426bbb..3d7d1100d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java @@ -1,5 +1,8 @@ package it.niedermann.nextcloud.deck.ui.widget.stack; +import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE; +import static it.niedermann.nextcloud.deck.util.WidgetUtil.pendingIntentFlagCompat; + import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -22,8 +25,6 @@ import it.niedermann.nextcloud.deck.persistence.sync.SyncManager; import it.niedermann.nextcloud.deck.ui.MainActivity; import it.niedermann.nextcloud.deck.ui.card.EditActivity; -import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE; - public class StackWidget extends AppWidgetProvider { private static final int PENDING_INTENT_OPEN_APP_RQ = 0; private static final int PENDING_INTENT_EDIT_CARD_RQ = 1; @@ -77,9 +78,9 @@ public class StackWidget extends AppWidgetProvider { final Intent intent = new Intent(Intent.ACTION_MAIN).setComponent(new ComponentName(context.getPackageName(), MainActivity.class.getName())); final PendingIntent pendingIntent = PendingIntent.getActivity(context, PENDING_INTENT_OPEN_APP_RQ, - intent, PendingIntent.FLAG_UPDATE_CURRENT); + intent, pendingIntentFlagCompat(PendingIntent.FLAG_UPDATE_CURRENT)); final PendingIntent templatePI = PendingIntent.getActivity(context, PENDING_INTENT_EDIT_CARD_RQ, - new Intent(context, EditActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); + new Intent(context, EditActivity.class), pendingIntentFlagCompat(PendingIntent.FLAG_UPDATE_CURRENT)); views.setOnClickPendingIntent(R.id.widget_stack_header_rl, pendingIntent); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java index cfb22bccd..bbb1b0af3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java @@ -1,6 +1,7 @@ package it.niedermann.nextcloud.deck.ui.widget.upcoming; import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE; +import static it.niedermann.nextcloud.deck.util.WidgetUtil.pendingIntentFlagCompat; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; @@ -126,7 +127,7 @@ public class UpcomingWidget extends AppWidgetProvider { serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME))); - final PendingIntent templatePI = PendingIntent.getBroadcast(context, appWidgetId, new Intent(context, UpcomingWidget.class), PendingIntent.FLAG_UPDATE_CURRENT); + final PendingIntent templatePI = PendingIntent.getBroadcast(context, appWidgetId, new Intent(context, UpcomingWidget.class), pendingIntentFlagCompat(PendingIntent.FLAG_UPDATE_CURRENT)); views.setPendingIntentTemplate(R.id.upcoming_widget_lv, templatePI); views.setRemoteAdapter(R.id.upcoming_widget_lv, serviceIntent); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/WidgetUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/WidgetUtil.java new file mode 100644 index 000000000..fed243ee6 --- /dev/null +++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/WidgetUtil.java @@ -0,0 +1,30 @@ +package it.niedermann.nextcloud.deck.util; + +import android.app.PendingIntent; +import android.os.Build; + +public class WidgetUtil { + + private WidgetUtil() { + throw new UnsupportedOperationException("This class must not get instantiated"); + } + + /** + * Android S requires either {@link PendingIntent#FLAG_MUTABLE} or + * {@link PendingIntent#FLAG_IMMUTABLE} to be set on a {@link PendingIntent}. + * This is enforced by Android and will lead to an app crash if neither of those flags is + * present. + * To keep the app working, this compatibility method can be used to add the + * {@link PendingIntent#FLAG_MUTABLE} flag on Android S and higher to restore the behavior of + * older SDK versions. + * + * @param flags wanted flags for {@link PendingIntent} + * @return {@param flags} | {@link PendingIntent#FLAG_MUTABLE} + */ + public static int pendingIntentFlagCompat(int flags) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + return flags | PendingIntent.FLAG_MUTABLE; + } + return flags; + } +} diff --git a/cross-tab-drag-and-drop/build.gradle b/cross-tab-drag-and-drop/build.gradle index f6dc49075..b315ec8a6 100644 --- a/cross-tab-drag-and-drop/build.gradle +++ b/cross-tab-drag-and-drop/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 31 + buildToolsVersion "31.0.0" defaultConfig { minSdkVersion 22 - targetSdkVersion 30 + targetSdkVersion 31 } } diff --git a/tab-layout-helper/build.gradle b/tab-layout-helper/build.gradle index f6dc49075..b315ec8a6 100644 --- a/tab-layout-helper/build.gradle +++ b/tab-layout-helper/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 31 + buildToolsVersion "31.0.0" defaultConfig { minSdkVersion 22 - targetSdkVersion 30 + targetSdkVersion 31 } } |