MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-29 05:16:51 +01:00
Code Releases Wiki Activity

Fossil/Skagen Hybrids: Fix some preference crashes on the nightly

Browse Source
This commit is contained in:
José Rebelo 2023-10-14 21:33:03 +01:00
parent 6ca73259b3
commit 11de66f8e4
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CalibrationActivity.java
View File

@ -150,7 +150,9 @@ public class CalibrationActivity extends AbstractGBActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
localBroadcastManager.sendBroadcast(new Intent(QHybridSupport.QHYBRID_COMMAND_SAVE_CALIBRATION)); if (localBroadcastManager != null) {
localBroadcastManager.sendBroadcast(new Intent(QHybridSupport.QHYBRID_COMMAND_UNCONTROL)); localBroadcastManager.sendBroadcast(new Intent(QHybridSupport.QHYBRID_COMMAND_SAVE_CALIBRATION));
localBroadcastManager.sendBroadcast(new Intent(QHybridSupport.QHYBRID_COMMAND_UNCONTROL));
}
} }
} }

4
app/src/main/res/xml/devicesettings_fossilhybridhr.xml
View File

@ -119,7 +119,7 @@
android:icon="@drawable/ic_pending_actions" android:icon="@drawable/ic_pending_actions"
android:summary="@string/qhybrid_pref_summary_actions"> android:summary="@string/qhybrid_pref_summary_actions">
<intent <intent
android:targetPackage="nodomain.freeyourgadget.gadgetbridge" android:targetPackage="@string/applicationId"
android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.CommuteActionsActivity" /> android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.CommuteActionsActivity" />
</Preference> </Preference>
@ -161,7 +161,7 @@
android:title="@string/qhybrid_title_file_management" android:title="@string/qhybrid_title_file_management"
android:summary="@string/qhybrid_summary_file_management"> android:summary="@string/qhybrid_summary_file_management">
<intent <intent
android:targetPackage="nodomain.freeyourgadget.gadgetbridge" android:targetPackage="@string/applicationId"
android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.FileManagementActivity" /> android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.FileManagementActivity" />
</Preference> </Preference>

2
app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml
View File

@ -7,7 +7,7 @@
android:icon="@drawable/ic_watch" android:icon="@drawable/ic_watch"
android:summary="@string/qhybrid_watchface_configuration_old_firmware"> android:summary="@string/qhybrid_watchface_configuration_old_firmware">
<intent <intent
android:targetPackage="nodomain.freeyourgadget.gadgetbridge" android:targetPackage="@string/applicationId"
android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.HRConfigActivity" /> android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.HRConfigActivity" />
</Preference> </Preference>