Merge branch 'release/v3.6.4'

SamAmco · Aug 27, 2023 · 098b033 · 098b033
2 parents fd7de5e + 167c968
commit 098b033
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -40,8 +40,8 @@ android {
         applicationId "com.samco.trackandgraph"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 300603
-        versionName "3.6.3"
+        versionCode 300604
+        versionName "3.6.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         vectorDrawables {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -60,14 +60,12 @@
         <receiver
             android:name=".base.service.RecreateAlarms"
             android:enabled="true"
-            android:directBootAware="true"
             android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.DATE_CHANGED" />
                 <action android:name="android.intent.action.TIME_SET" />
                 <action android:name="android.intent.action.TIMEZONE_CHANGED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>

diff --git a/base/src/main/res/values/strings.xml b/base/src/main/res/values/strings.xml
@@ -272,8 +272,8 @@
     <string name="data_point_tutorial_page_3_description">Use labels if you want to group the data points</string>
     <string name="data_point_tutorial_page_3_hint">(Hint: If you want to add more context or description use the note instead of the label field)</string>
     <string name="help">Help</string>
-    <string name="faq_page_link" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.3/docs/faq/index.md#faq</string>
-    <string name="faq_page_link_1" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.3/docs/faq/faq_1.md#how-do-i-start-tracking-something</string>
+    <string name="faq_page_link" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.4/docs/faq/index.md#faq</string>
+    <string name="faq_page_link_1" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.4/docs/faq/faq_1.md#how-do-i-start-tracking-something</string>
     <string name="advanced_options">Advanced options</string>
     <string name="type_colon">"Type: "</string>
     <string name="order_colon">"Order: "</string>

diff --git a/fastlane/metadata/android/en-GB/changelogs/300604.txt b/fastlane/metadata/android/en-GB/changelogs/300604.txt
@@ -0,0 +1,3 @@
+- Fix bug silent crash on locked boot (can't re-create alarms until unlock)
+
+