diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java
index d510ffc06..edf0a3867 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java
@@ -36,6 +36,10 @@ public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
+ if (!GBApplication.getPrefs().getBoolean("send_sunrise_sunset", false)) {
+ LOG.info("won't send sunrise and sunset events (disabled in preferences)");
+ return;
+ }
LOG.info("will resend sunrise and sunset events");
final GregorianCalendar dateTimeTomorrow = new GregorianCalendar();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c17912d0..53a01068d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,8 +76,11 @@
Allow 3rd Party Android App Access
Enable experimental support for Android Apps using PebbleKit
+ Sunrise and Sunset
+ Send sunrise and sunset times based on the location to the pebble timeline
+
Location
- Aquire Location
+ Acquire Location
Latitude
Longitude
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 43ff84f70..667f5184b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -215,6 +215,10 @@
android:key="pebble_activitytracker"
android:title="@string/pref_title_pebble_activitytracker"
android:summary="%s" />
+
@@ -222,10 +226,12 @@
android:key="location_aquire"
android:title="@string/pref_title_location_aquire"/>