From 8c6331237d7e86ea5b53b7b13588497cd1c305ec Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Tue, 4 Jan 2022 16:14:13 +0100
Subject: [PATCH] Cosmetics

---
 app/src/apkFlavor/AndroidManifest.xml         |  8 -----
 app/src/fdroidFlavor/AndroidManifest.xml      |  8 -----
 app/src/googlePlayFlavor/AndroidManifest.xml  |  8 -----
 .../receivers/PackageReplacedReceiver.java    | 33 +++++++------------
 4 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml
index a5c4d5b8..0f375056 100644
--- a/app/src/apkFlavor/AndroidManifest.xml
+++ b/app/src/apkFlavor/AndroidManifest.xml
@@ -122,15 +122,7 @@
         <receiver android:name=".receivers.PackageReplacedReceiver"
             android:enabled="true">
             <intent-filter>
-                <!--<action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <action android:name="android.intent.action.ACTION_PACKAGE_REPLACED" />-->
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <!--<data
-                    android:path="com.jens.automation2"
-                    android:scheme="package" />-->
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.DateTimeListener" />
diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml
index fb21e9df..f18913b7 100644
--- a/app/src/fdroidFlavor/AndroidManifest.xml
+++ b/app/src/fdroidFlavor/AndroidManifest.xml
@@ -119,15 +119,7 @@
         <receiver android:name=".receivers.PackageReplacedReceiver"
             android:enabled="true">
             <intent-filter>
-                <!--<action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <action android:name="android.intent.action.ACTION_PACKAGE_REPLACED" />-->
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <!--<data
-                    android:path="com.jens.automation2"
-                    android:scheme="package" />-->
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.DateTimeListener" />
diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml
index 44c59d64..a5d92b61 100644
--- a/app/src/googlePlayFlavor/AndroidManifest.xml
+++ b/app/src/googlePlayFlavor/AndroidManifest.xml
@@ -114,15 +114,7 @@
         <receiver android:name=".receivers.PackageReplacedReceiver"
             android:enabled="true">
             <intent-filter>
-                <!--<action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <action android:name="android.intent.action.ACTION_PACKAGE_REPLACED" />-->
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <!--<data
-                    android:path="com.jens.automation2"
-                    android:scheme="package" />-->
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.DateTimeListener" />
diff --git a/app/src/main/java/com/jens/automation2/receivers/PackageReplacedReceiver.java b/app/src/main/java/com/jens/automation2/receivers/PackageReplacedReceiver.java
index de80fd07..af23a1bc 100644
--- a/app/src/main/java/com/jens/automation2/receivers/PackageReplacedReceiver.java
+++ b/app/src/main/java/com/jens/automation2/receivers/PackageReplacedReceiver.java
@@ -14,29 +14,18 @@ public class PackageReplacedReceiver extends BroadcastReceiver
 	@Override
 	public void onReceive(Context context, Intent intent)
 	{
-//		Toast.makeText(context, "package replaced", Toast.LENGTH_LONG).show();
-//		int intentUid = intent.getExtras().getInt("android.intent.extra.UID");	// userid of the application that has just been updated
-//		int myUid = android.os.Process.myUid();										// userid of this application
-//
-//		boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
-		
-//		if(intentUid == myUid)
-//		{
-			Settings.readFromPersistentStorage(context);
+		Settings.readFromPersistentStorage(context);
 
-			Miscellaneous.logEvent("i", context.getResources().getString(R.string.applicationHasBeenUpdated), context.getResources().getString(R.string.applicationHasBeenUpdated), 2);
-			if(hasServiceBeenRunning() && Settings.startServiceAfterAppUpdate)
-			{
-				Miscellaneous.logEvent("i", "Service", context.getResources().getString(R.string.logStartingServiceAfterAppUpdate), 1);
-				AutomationService.startAutomationService(context, true);
-			}
-			else
-			{
-				Miscellaneous.logEvent("i", "Service", context.getResources().getString(R.string.logNotStartingServiceAfterAppUpdate), 2);
-			}
-//		}
-//		else
-//			Miscellaneous.logEvent("i", "Service", "Some other app has been updated.", 5);
+		Miscellaneous.logEvent("i", context.getResources().getString(R.string.applicationHasBeenUpdated), context.getResources().getString(R.string.applicationHasBeenUpdated), 2);
+		if(hasServiceBeenRunning() && Settings.startServiceAfterAppUpdate)
+		{
+			Miscellaneous.logEvent("i", "Service", context.getResources().getString(R.string.logStartingServiceAfterAppUpdate), 1);
+			AutomationService.startAutomationService(context, true);
+		}
+		else
+		{
+			Miscellaneous.logEvent("i", "Service", context.getResources().getString(R.string.logNotStartingServiceAfterAppUpdate), 2);
+		}
 	}
 	
 	private static boolean hasServiceBeenRunning()