Merge pull request #48 from WildOrangutan

Fixed notification actions on Oreo devices
mathisdt · Oct 28, 2018 · 797b71a · 797b71a
2 parents 09ad3c9 + c22af2d
commit 797b71a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -46,10 +46,6 @@
             android:name="ThirdPartyReceiver"
             android:exported="true"
             tools:ignore="ExportedReceiver" >
-            <intent-filter>
-                <action android:name="org.zephyrsoft.trackworktime.ClockIn" />
-                <action android:name="org.zephyrsoft.trackworktime.ClockOut" />
-            </intent-filter>
         </receiver>
 
         <service

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/Basics.java b/app/src/main/java/org/zephyrsoft/trackworktime/Basics.java
@@ -25,6 +25,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.location.Location;
@@ -82,6 +83,7 @@ public class Basics extends BroadcastReceiver {
 	private ExternalNotificationManager externalNotificationManager = null;
 	private NotificationChannel notificationChannel = null;
 	private NotificationChannel serviceNotificationChannel = null;
+	private ThirdPartyReceiver thirdPartyReceiver;
 
 	private static Basics instance = null;
 
@@ -116,7 +118,6 @@ public static Basics getOrCreateInstance(Context androidContext) {
 	public void onReceive(Context androidContext, Intent intent) {
 		// always only use the one instance
 		instance.receivedIntent(androidContext);
-
 	}
 
 	/**
@@ -146,6 +147,33 @@ private void init() {
 			.writingThread(threadToObserve, 1)
 			.activate();
 		Logger.info("logger initialized - writing thread observes \"{}\"", threadToObserve);
+
+		registerThirdPartyReceiver();
+	}
+
+	private void registerThirdPartyReceiver() {
+		if(thirdPartyReceiver != null) {
+			Logger.warn(ThirdPartyReceiver.class.getSimpleName() + " already registered, skipping.");
+			return;
+		}
+
+		thirdPartyReceiver = new ThirdPartyReceiver();
+		IntentFilter intentFilter = new IntentFilter();
+		intentFilter.addAction("org.zephyrsoft.trackworktime.ClockIn");
+		intentFilter.addAction("org.zephyrsoft.trackworktime.ClockOut");
+		context.registerReceiver(thirdPartyReceiver, intentFilter);
+		Logger.debug("Registered " + ThirdPartyReceiver.class.getSimpleName());
+	}
+
+	public void unregisterThirdPartyReceiver() {
+		if(thirdPartyReceiver == null) {
+			Logger.warn(ThirdPartyReceiver.class.getSimpleName() + " not registered, skipping.");
+			return;
+		}
+
+		context.unregisterReceiver(thirdPartyReceiver);
+		thirdPartyReceiver = null;
+		Logger.debug("Unregistered " + ThirdPartyReceiver.class.getSimpleName());
 	}
 
 	public File getCurrentLogFile() {

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/WorkTimeTrackerApplication.java b/app/src/main/java/org/zephyrsoft/trackworktime/WorkTimeTrackerApplication.java
@@ -112,6 +112,7 @@ public void onCreate() {
 	public void onTerminate() {
 		Logger.info("terminating application");
 		Basics.getOrCreateInstance(getApplicationContext()).getDao().close();
+		Basics.getInstance().unregisterThirdPartyReceiver();
 		super.onTerminate();
 	}