adding some Android 12 related preparations

This commit is contained in:
tibbi
2022-04-06 22:56:23 +02:00
parent aa8020b6b0
commit ac2e202f5c
11 changed files with 104 additions and 40 deletions

View File

@@ -45,7 +45,9 @@
<activity <activity
android:name=".activities.MainActivity" android:name=".activities.MainActivity"
android:exported="true"
android:launchMode="singleTask"> android:launchMode="singleTask">
<meta-data <meta-data
android:name="android.app.default_searchable" android:name="android.app.default_searchable"
android:resource="@xml/searchable" /> android:resource="@xml/searchable" />
@@ -83,8 +85,10 @@
<activity <activity
android:name=".activities.WidgetMonthlyConfigureActivity" android:name=".activities.WidgetMonthlyConfigureActivity"
android:exported="true"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/MyWidgetConfigTheme"> android:theme="@style/MyWidgetConfigTheme">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" /> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter> </intent-filter>
@@ -92,6 +96,7 @@
<activity <activity
android:name=".activities.WidgetListConfigureActivity" android:name=".activities.WidgetListConfigureActivity"
android:exported="true"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/MyWidgetConfigTheme"> android:theme="@style/MyWidgetConfigTheme">
<intent-filter> <intent-filter>
@@ -101,6 +106,7 @@
<activity <activity
android:name=".activities.WidgetDateConfigureActivity" android:name=".activities.WidgetDateConfigureActivity"
android:exported="true"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/MyWidgetConfigTheme"> android:theme="@style/MyWidgetConfigTheme">
<intent-filter> <intent-filter>
@@ -110,16 +116,19 @@
<activity <activity
android:name="com.simplemobiletools.commons.activities.AboutActivity" android:name="com.simplemobiletools.commons.activities.AboutActivity"
android:exported="false"
android:label="@string/about" android:label="@string/about"
android:parentActivityName=".activities.MainActivity" /> android:parentActivityName=".activities.MainActivity" />
<activity <activity
android:name="com.simplemobiletools.commons.activities.CustomizationActivity" android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
android:exported="false"
android:label="@string/customize_colors" android:label="@string/customize_colors"
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name=".activities.EventActivity" android:name=".activities.EventActivity"
android:exported="true"
android:label="@string/new_event" android:label="@string/new_event"
android:launchMode="singleTask" android:launchMode="singleTask"
android:parentActivityName=".activities.MainActivity"> android:parentActivityName=".activities.MainActivity">
@@ -143,12 +152,14 @@
<activity <activity
android:name=".activities.TaskActivity" android:name=".activities.TaskActivity"
android:exported="false"
android:label="@string/new_task" android:label="@string/new_task"
android:launchMode="singleTask" android:launchMode="singleTask"
android:parentActivityName=".activities.MainActivity" /> android:parentActivityName=".activities.MainActivity" />
<activity <activity
android:name=".activities.SelectTimeZoneActivity" android:name=".activities.SelectTimeZoneActivity"
android:exported="false"
android:parentActivityName=".activities.EventActivity"> android:parentActivityName=".activities.EventActivity">
<meta-data <meta-data
android:name="android.app.default_searchable" android:name="android.app.default_searchable"
@@ -161,20 +172,30 @@
<activity <activity
android:name=".activities.SettingsActivity" android:name=".activities.SettingsActivity"
android:exported="true"
android:label="@string/settings" android:label="@string/settings"
android:parentActivityName=".activities.MainActivity" /> android:parentActivityName=".activities.MainActivity">
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity <activity
android:name=".activities.ManageEventTypesActivity" android:name=".activities.ManageEventTypesActivity"
android:exported="false"
android:label="@string/event_types" android:label="@string/event_types"
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name=".activities.SnoozeReminderActivity" android:name=".activities.SnoozeReminderActivity"
android:exported="false"
android:theme="@style/Theme.Transparent" /> android:theme="@style/Theme.Transparent" />
<receiver <receiver
android:name=".helpers.MyWidgetMonthlyProvider" android:name=".helpers.MyWidgetMonthlyProvider"
android:exported="true"
android:icon="@drawable/img_widget_monthly_preview" android:icon="@drawable/img_widget_monthly_preview"
android:label="@string/widget_monthly"> android:label="@string/widget_monthly">
<intent-filter> <intent-filter>
@@ -188,6 +209,7 @@
<receiver <receiver
android:name=".helpers.MyWidgetListProvider" android:name=".helpers.MyWidgetListProvider"
android:exported="true"
android:icon="@drawable/img_widget_list_preview" android:icon="@drawable/img_widget_list_preview"
android:label="@string/widget_list"> android:label="@string/widget_list">
<intent-filter> <intent-filter>
@@ -201,6 +223,7 @@
<receiver <receiver
android:name=".helpers.MyWidgetDateProvider" android:name=".helpers.MyWidgetDateProvider"
android:exported="true"
android:icon="@drawable/img_widget_date_preview" android:icon="@drawable/img_widget_date_preview"
android:label="@string/widget_todays_date"> android:label="@string/widget_todays_date">
<intent-filter> <intent-filter>
@@ -214,10 +237,12 @@
<service <service
android:name=".services.WidgetService" android:name=".services.WidgetService"
android:exported="true"
android:permission="android.permission.BIND_REMOTEVIEWS" /> android:permission="android.permission.BIND_REMOTEVIEWS" />
<service <service
android:name=".services.WidgetServiceEmpty" android:name=".services.WidgetServiceEmpty"
android:exported="true"
android:permission="android.permission.BIND_REMOTEVIEWS" /> android:permission="android.permission.BIND_REMOTEVIEWS" />
<service android:name=".services.SnoozeService" /> <service android:name=".services.SnoozeService" />
@@ -227,11 +252,18 @@
android:exported="true" android:exported="true"
android:permission="android.permission.BIND_JOB_SERVICE" /> android:permission="android.permission.BIND_JOB_SERVICE" />
<receiver android:name=".receivers.NotificationReceiver" /> <receiver
android:name=".receivers.NotificationReceiver"
android:exported="false" />
<receiver android:name=".receivers.CalDAVSyncReceiver" /> <receiver
android:name=".receivers.CalDAVSyncReceiver"
android:exported="false" />
<receiver
android:name=".receivers.BootCompletedReceiver"
android:exported="true">
<receiver android:name=".receivers.BootCompletedReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" /> <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@@ -252,6 +284,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Red" android:name=".activities.SplashActivity.Red"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_red" android:icon="@mipmap/ic_launcher_red"
android:roundIcon="@mipmap/ic_launcher_red" android:roundIcon="@mipmap/ic_launcher_red"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -265,6 +298,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Pink" android:name=".activities.SplashActivity.Pink"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_pink" android:icon="@mipmap/ic_launcher_pink"
android:roundIcon="@mipmap/ic_launcher_pink" android:roundIcon="@mipmap/ic_launcher_pink"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -278,6 +312,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Purple" android:name=".activities.SplashActivity.Purple"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_purple" android:icon="@mipmap/ic_launcher_purple"
android:roundIcon="@mipmap/ic_launcher_purple" android:roundIcon="@mipmap/ic_launcher_purple"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -291,6 +326,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Deep_purple" android:name=".activities.SplashActivity.Deep_purple"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_purple" android:icon="@mipmap/ic_launcher_deep_purple"
android:roundIcon="@mipmap/ic_launcher_deep_purple" android:roundIcon="@mipmap/ic_launcher_deep_purple"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -304,6 +340,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Indigo" android:name=".activities.SplashActivity.Indigo"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_indigo" android:icon="@mipmap/ic_launcher_indigo"
android:roundIcon="@mipmap/ic_launcher_indigo" android:roundIcon="@mipmap/ic_launcher_indigo"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -317,6 +354,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Blue" android:name=".activities.SplashActivity.Blue"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue" android:icon="@mipmap/ic_launcher_blue"
android:roundIcon="@mipmap/ic_launcher_blue" android:roundIcon="@mipmap/ic_launcher_blue"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -330,6 +368,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Light_blue" android:name=".activities.SplashActivity.Light_blue"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_blue" android:icon="@mipmap/ic_launcher_light_blue"
android:roundIcon="@mipmap/ic_launcher_light_blue" android:roundIcon="@mipmap/ic_launcher_light_blue"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -343,6 +382,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Cyan" android:name=".activities.SplashActivity.Cyan"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_cyan" android:icon="@mipmap/ic_launcher_cyan"
android:roundIcon="@mipmap/ic_launcher_cyan" android:roundIcon="@mipmap/ic_launcher_cyan"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -356,6 +396,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Teal" android:name=".activities.SplashActivity.Teal"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_teal" android:icon="@mipmap/ic_launcher_teal"
android:roundIcon="@mipmap/ic_launcher_teal" android:roundIcon="@mipmap/ic_launcher_teal"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -369,6 +410,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Green" android:name=".activities.SplashActivity.Green"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_green" android:icon="@mipmap/ic_launcher_green"
android:roundIcon="@mipmap/ic_launcher_green" android:roundIcon="@mipmap/ic_launcher_green"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -382,6 +424,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Light_green" android:name=".activities.SplashActivity.Light_green"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_green" android:icon="@mipmap/ic_launcher_light_green"
android:roundIcon="@mipmap/ic_launcher_light_green" android:roundIcon="@mipmap/ic_launcher_light_green"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -395,6 +438,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Lime" android:name=".activities.SplashActivity.Lime"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_lime" android:icon="@mipmap/ic_launcher_lime"
android:roundIcon="@mipmap/ic_launcher_lime" android:roundIcon="@mipmap/ic_launcher_lime"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -408,6 +452,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Yellow" android:name=".activities.SplashActivity.Yellow"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_yellow" android:icon="@mipmap/ic_launcher_yellow"
android:roundIcon="@mipmap/ic_launcher_yellow" android:roundIcon="@mipmap/ic_launcher_yellow"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -421,6 +466,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Amber" android:name=".activities.SplashActivity.Amber"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_amber" android:icon="@mipmap/ic_launcher_amber"
android:roundIcon="@mipmap/ic_launcher_amber" android:roundIcon="@mipmap/ic_launcher_amber"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -434,6 +480,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Orange" android:name=".activities.SplashActivity.Orange"
android:enabled="true" android:enabled="true"
android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -446,6 +493,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Deep_orange" android:name=".activities.SplashActivity.Deep_orange"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_orange" android:icon="@mipmap/ic_launcher_deep_orange"
android:roundIcon="@mipmap/ic_launcher_deep_orange" android:roundIcon="@mipmap/ic_launcher_deep_orange"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -459,6 +507,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Brown" android:name=".activities.SplashActivity.Brown"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_brown" android:icon="@mipmap/ic_launcher_brown"
android:roundIcon="@mipmap/ic_launcher_brown" android:roundIcon="@mipmap/ic_launcher_brown"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -472,6 +521,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Blue_grey" android:name=".activities.SplashActivity.Blue_grey"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue_grey" android:icon="@mipmap/ic_launcher_blue_grey"
android:roundIcon="@mipmap/ic_launcher_blue_grey" android:roundIcon="@mipmap/ic_launcher_blue_grey"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
@@ -485,6 +535,7 @@
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Grey_black" android:name=".activities.SplashActivity.Grey_black"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_grey_black" android:icon="@mipmap/ic_launcher_grey_black"
android:roundIcon="@mipmap/ic_launcher_grey_black" android:roundIcon="@mipmap/ic_launcher_grey_black"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">

View File

@@ -174,12 +174,12 @@ fun Context.getNotificationIntent(event: Event): PendingIntent {
val intent = Intent(this, NotificationReceiver::class.java) val intent = Intent(this, NotificationReceiver::class.java)
intent.putExtra(EVENT_ID, event.id) intent.putExtra(EVENT_ID, event.id)
intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS) intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
return PendingIntent.getBroadcast(this, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) return PendingIntent.getBroadcast(this, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} }
fun Context.cancelPendingIntent(id: Long) { fun Context.cancelPendingIntent(id: Long) {
val intent = Intent(this, NotificationReceiver::class.java) val intent = Intent(this, NotificationReceiver::class.java)
PendingIntent.getBroadcast(this, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT).cancel() PendingIntent.getBroadcast(this, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE).cancel()
} }
fun Context.getRepetitionText(seconds: Int) = when (seconds) { fun Context.getRepetitionText(seconds: Int) = when (seconds) {
@@ -340,7 +340,7 @@ private fun getPendingIntent(context: Context, event: Event): PendingIntent {
val intent = Intent(context, EventActivity::class.java) val intent = Intent(context, EventActivity::class.java)
intent.putExtra(EVENT_ID, event.id) intent.putExtra(EVENT_ID, event.id)
intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS) intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
return PendingIntent.getActivity(context, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) return PendingIntent.getActivity(context, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} }
private fun getSnoozePendingIntent(context: Context, event: Event): PendingIntent { private fun getSnoozePendingIntent(context: Context, event: Event): PendingIntent {
@@ -348,9 +348,9 @@ private fun getSnoozePendingIntent(context: Context, event: Event): PendingInten
val intent = Intent(context, snoozeClass).setAction("Snooze") val intent = Intent(context, snoozeClass).setAction("Snooze")
intent.putExtra(EVENT_ID, event.id) intent.putExtra(EVENT_ID, event.id)
return if (context.config.useSameSnooze) { return if (context.config.useSameSnooze) {
PendingIntent.getService(context, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) PendingIntent.getService(context, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} else { } else {
PendingIntent.getActivity(context, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) PendingIntent.getActivity(context, event.id!!.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} }
} }
@@ -421,7 +421,12 @@ fun Context.recheckCalDAVCalendars(scheduleNextCalDAVSync: Boolean, callback: ()
fun Context.scheduleCalDAVSync(activate: Boolean) { fun Context.scheduleCalDAVSync(activate: Boolean) {
val syncIntent = Intent(applicationContext, CalDAVSyncReceiver::class.java) val syncIntent = Intent(applicationContext, CalDAVSyncReceiver::class.java)
val pendingIntent = PendingIntent.getBroadcast(applicationContext, SCHEDULE_CALDAV_REQUEST_CODE, syncIntent, PendingIntent.FLAG_UPDATE_CURRENT) val pendingIntent = PendingIntent.getBroadcast(
applicationContext,
SCHEDULE_CALDAV_REQUEST_CODE,
syncIntent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
val alarm = getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarm = getSystemService(Context.ALARM_SERVICE) as AlarmManager
alarm.cancel(pendingIntent) alarm.cancel(pendingIntent)

View File

@@ -39,7 +39,7 @@ class MyWidgetDateProvider : AppWidgetProvider() {
private fun setupAppOpenIntent(context: Context, views: RemoteViews) { private fun setupAppOpenIntent(context: Context, views: RemoteViews) {
(context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply { (context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply {
val pendingIntent = PendingIntent.getActivity(context, OPEN_APP_INTENT_ID, this, PendingIntent.FLAG_UPDATE_CURRENT) val pendingIntent = PendingIntent.getActivity(context, OPEN_APP_INTENT_ID, this, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
views.setOnClickPendingIntent(R.id.widget_date_holder, pendingIntent) views.setOnClickPendingIntent(R.id.widget_date_holder, pendingIntent)
} }
} }

View File

@@ -63,7 +63,8 @@ class MyWidgetListProvider : AppWidgetProvider() {
} }
val startActivityIntent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java) val startActivityIntent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)
val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT) val startActivityPendingIntent =
PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
views.setPendingIntentTemplate(R.id.widget_event_list, startActivityPendingIntent) views.setPendingIntentTemplate(R.id.widget_event_list, startActivityPendingIntent)
views.setEmptyView(R.id.widget_event_list, R.id.widget_event_list_empty) views.setEmptyView(R.id.widget_event_list, R.id.widget_event_list_empty)
@@ -78,7 +79,7 @@ class MyWidgetListProvider : AppWidgetProvider() {
private fun setupIntent(context: Context, views: RemoteViews, action: String, id: Int) { private fun setupIntent(context: Context, views: RemoteViews, action: String, id: Int) {
Intent(context, MyWidgetListProvider::class.java).apply { Intent(context, MyWidgetListProvider::class.java).apply {
this.action = action this.action = action
val pendingIntent = PendingIntent.getBroadcast(context, 0, this, 0) val pendingIntent = PendingIntent.getBroadcast(context, 0, this, PendingIntent.FLAG_IMMUTABLE)
views.setOnClickPendingIntent(id, pendingIntent) views.setOnClickPendingIntent(id, pendingIntent)
} }
} }

View File

@@ -45,7 +45,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
private fun setupIntent(context: Context, views: RemoteViews, action: String, id: Int) { private fun setupIntent(context: Context, views: RemoteViews, action: String, id: Int) {
Intent(context, MyWidgetMonthlyProvider::class.java).apply { Intent(context, MyWidgetMonthlyProvider::class.java).apply {
this.action = action this.action = action
val pendingIntent = PendingIntent.getBroadcast(context, 0, this, 0) val pendingIntent = PendingIntent.getBroadcast(context, 0, this, PendingIntent.FLAG_IMMUTABLE)
views.setOnClickPendingIntent(id, pendingIntent) views.setOnClickPendingIntent(id, pendingIntent)
} }
} }
@@ -54,7 +54,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
(context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply { (context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply {
putExtra(DAY_CODE, dayCode) putExtra(DAY_CODE, dayCode)
putExtra(VIEW_TO_OPEN, MONTHLY_VIEW) putExtra(VIEW_TO_OPEN, MONTHLY_VIEW)
val pendingIntent = PendingIntent.getActivity(context, Integer.parseInt(dayCode.substring(0, 6)), this, 0) val pendingIntent = PendingIntent.getActivity(context, Integer.parseInt(dayCode.substring(0, 6)), this, PendingIntent.FLAG_IMMUTABLE)
views.setOnClickPendingIntent(id, pendingIntent) views.setOnClickPendingIntent(id, pendingIntent)
} }
} }
@@ -63,7 +63,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
(context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply { (context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply {
putExtra(DAY_CODE, dayCode) putExtra(DAY_CODE, dayCode)
putExtra(VIEW_TO_OPEN, DAILY_VIEW) putExtra(VIEW_TO_OPEN, DAILY_VIEW)
val pendingIntent = PendingIntent.getActivity(context, Integer.parseInt(dayCode), this, 0) val pendingIntent = PendingIntent.getActivity(context, Integer.parseInt(dayCode), this, PendingIntent.FLAG_IMMUTABLE)
views.setOnClickPendingIntent(id, pendingIntent) views.setOnClickPendingIntent(id, pendingIntent)
} }
} }

View File

@@ -29,30 +29,37 @@
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/go_to_date" android:id="@+id/go_to_date"
android:showAsAction="never"
android:title="@string/go_to_date" android:title="@string/go_to_date"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/print" android:id="@+id/print"
android:showAsAction="never"
android:title="@string/print" android:title="@string/print"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/add_holidays" android:id="@+id/add_holidays"
android:showAsAction="never"
android:title="@string/add_holidays" android:title="@string/add_holidays"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/add_birthdays" android:id="@+id/add_birthdays"
android:showAsAction="never"
android:title="@string/add_birthdays" android:title="@string/add_birthdays"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/add_anniversaries" android:id="@+id/add_anniversaries"
android:showAsAction="never"
android:title="@string/add_anniversaries" android:title="@string/add_anniversaries"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/import_events" android:id="@+id/import_events"
android:showAsAction="never"
android:title="@string/import_events_from_ics" android:title="@string/import_events_from_ics"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/export_events" android:id="@+id/export_events"
android:showAsAction="never"
android:title="@string/export_events_to_ics" android:title="@string/export_events_to_ics"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item