Compare commits

...

2 commits

Author SHA1 Message Date
24108822a2 ShelterDeviceAdminReceiver: remove FLAG_ONGOING_EVENT
This prevents the notification from being shown on S
2021-10-14 18:28:14 -04:00
35fc9ba1bd WIP: bump targetSdkVersion to 31 2021-10-14 18:16:13 -04:00
3 changed files with 13 additions and 8 deletions

View file

@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "net.typeblog.shelter"
minSdkVersion 24
targetSdkVersion 30
targetSdkVersion 31
versionCode 18
versionName "1.7-dev1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

View file

@ -36,7 +36,8 @@
<!-- The main activity for UI -->
<activity android:name=".ui.MainActivity"
android:launchMode="singleTask">
android:launchMode="singleTask"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@ -46,7 +47,8 @@
<!-- Setup Wizard -->
<activity android:name=".ui.SetupWizardActivity"
android:theme="@style/SuwThemeMaterial.Light"
android:launchMode="singleTask" />
android:launchMode="singleTask"
android:exported="false"/>
<!-- The Settings activity -->
<activity android:name=".ui.SettingsActivity"
@ -57,7 +59,8 @@
<activity android:name=".ui.DummyActivity"
android:excludeFromRecents="true"
android:launchMode="singleTask"
android:theme="@style/Theme.AppCompat.Translucent.NoTitleBar">
android:theme="@style/Theme.AppCompat.Translucent.NoTitleBar"
android:exported="true">
<intent-filter>
<action android:name="net.typeblog.shelter.action.FINALIZE_PROVISION" />
<action android:name="net.typeblog.shelter.action.START_SERVICE" />
@ -82,7 +85,8 @@
<activity android:name=".ui.CameraProxyActivity"
android:excludeFromRecents="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:label="@string/camera_proxy_activity">
android:label="@string/camera_proxy_activity"
android:exported="true">
<intent-filter>
<action android:name="android.media.action.IMAGE_CAPTURE" />
<category android:name="android.intent.category.DEFAULT" />
@ -93,7 +97,8 @@
<receiver android:name=".receivers.ShelterDeviceAdminReceiver"
android:label="@string/device_admin_label"
android:description="@string/device_admin_desc"
android:permission="android.permission.BIND_DEVICE_ADMIN">
android:permission="android.permission.BIND_DEVICE_ADMIN"
android:exported="true">
<meta-data android:name="android.app.device_admin"
android:resource="@xml/device_admin" />
<intent-filter>

View file

@ -30,8 +30,8 @@ public class ShelterDeviceAdminReceiver extends DeviceAdminReceiver {
context.getString(R.string.finish_provision_desc),
R.drawable.ic_notification_white_24dp);
notification.contentIntent = PendingIntent.getActivity(context, 0, i,
PendingIntent.FLAG_UPDATE_CURRENT);
notification.flags |= Notification.FLAG_AUTO_CANCEL | Notification.FLAG_ONGOING_EVENT;
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
notification.flags |= Notification.FLAG_AUTO_CANCEL;
context.getSystemService(NotificationManager.class)
.notify(NOTIFICATION_ID, notification);
}