From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Mon, 28 Feb 2022 20:29:08 +0000 (+0000)
Subject: Make the app usable over the lockscreen
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=08dcc143d8ac980de3166710a97bef68f7315f16;p=acmetensortoys-ctfws-android

Make the app usable over the lockscreen

Leave the preferences activity as requiring unlock, FWIW
---

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index b2e9efc..44ca6ef 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -25,7 +25,9 @@
         tools:ignore="UnusedAttribute">
 
         <activity android:name=".activity.main.Activity"
-            android:exported="true">
+            android:exported="true"
+            android:showWhenLocked="true"
+            android:showForAllUsers="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -38,14 +40,18 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".activity.AboutActivity" />
+        <activity android:name=".activity.AboutActivity"
+            android:showWhenLocked="true"
+            android:showForAllUsers="true" />
 
         <activity android:name=".activity.SettingsActivity" />
 
         <activity
             android:name=".activity.HandbookActivity"
             android:icon="@mipmap/ic_shield_1"
-            android:label="@string/app_name_hand">
+            android:label="@string/app_name_hand"
+            android:showWhenLocked="true"
+            android:showForAllUsers="true">
 
             <!--
             <intent-filter>
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
index 63037e9..3487517 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
@@ -43,7 +43,8 @@ class MainServiceNotification {
         Intent ni = new Intent(ms, Activity.class);
         ni.setAction(Intent.ACTION_MAIN);
         ni.addCategory(Intent.CATEGORY_LAUNCHER);
-        ni.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        ni.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                  | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannel nc = new NotificationChannel(