PeterCxy/Shelter
8
11
Fork 2
Code Issues Pull requests Projects Releases Activity

Compare commits

base: PeterCxy:24108822a22764a0df01ead2c88189fd4ea9f751
Branches Tags
PeterCxy:master
PeterCxy:1.9.1
PeterCxy:1.9
PeterCxy:1.8
PeterCxy:1.7
PeterCxy:1.6
PeterCxy:1.5.1
PeterCxy:1.5
PeterCxy:1.4.1
PeterCxy:1.4
PeterCxy:1.3
PeterCxy:1.2
PeterCxy:1.1
PeterCxy:1.0
..
compare: PeterCxy:0ae375e6a33a69bf6e9ede609972d939f8d7e446
Branches Tags
PeterCxy:master
PeterCxy:1.9.1
PeterCxy:1.9
PeterCxy:1.8
PeterCxy:1.7
PeterCxy:1.6
PeterCxy:1.5.1
PeterCxy:1.5
PeterCxy:1.4.1
PeterCxy:1.4
PeterCxy:1.3
PeterCxy:1.2
PeterCxy:1.1
PeterCxy:1.0

No commits in common. "24108822a22764a0df01ead2c88189fd4ea9f751" and "0ae375e6a33a69bf6e9ede609972d939f8d7e446" have entirely different histories.
24108822a2 ... 0ae375e6a3

3 changed files with 8 additions and 13 deletions
Show stats Expand all files Collapse all files

2
app/build.gradle
View file

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

15
app/src/main/AndroidManifest.xml
View file

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

4
app/src/main/java/net/typeblog/shelter/receivers/ShelterDeviceAdminReceiver.java
View file

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