From 1f6ddb7b11f9cd6c6c784d486b2f3fe4275e8714 Mon Sep 17 00:00:00 2001
From: M66B <marcel@bokhorst.biz>
Date: Thu, 21 Nov 2013 18:32:44 +0100
Subject: [PATCH] Fixed activity history, hopefully this does not break
 something else

Fixes #804
---
 AndroidManifest.xml                          | 3 ---
 CHANGELOG.md                                 | 5 +++--
 src/biz/bokhorst/xprivacy/PackageChange.java | 9 ++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cde2267ed..5d1e7120c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,8 +42,6 @@
         </activity>
         <activity
             android:name=".ActivityApp"
-            android:allowTaskReparenting="true"
-            android:noHistory="true"
             android:parentActivityName=".ActivityMain"
             android:taskAffinity=".ActivityMain" >
             <meta-data
@@ -52,7 +50,6 @@
         </activity>
         <activity
             android:name=".ActivityUsage"
-            android:noHistory="true"
             android:parentActivityName=".ActivityMain" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 793501942..02731ff45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,12 @@ Changelog
 
 **Next release**
 
-* Mark all functions in the system category as dangerous, except one
+* Marked all functions in the system category as dangerous, except one
 * Don't return an empty gids list to prevent exception
 * Require [Pro enabler](http://play.google.com/store/apps/details?id=biz.bokhorst.xprivacy.pro) version 1.12
 * Leave randomize button enabled when randomize on boot is enabled, thanks @[jpeg729](https://github.com/jpeg729)
-* Change title of usage data view
+* Changed title of usage data view
+* Fixed activity history ([issue](https://github.com/M66B/XPrivacy/issues/804))
 
 **Version 1.10.20 TEST**
 
diff --git a/src/biz/bokhorst/xprivacy/PackageChange.java b/src/biz/bokhorst/xprivacy/PackageChange.java
index 61e90d091..7e496f7fc 100644
--- a/src/biz/bokhorst/xprivacy/PackageChange.java
+++ b/src/biz/bokhorst/xprivacy/PackageChange.java
@@ -61,20 +61,19 @@ public void onReceive(Context context, Intent intent) {
 						if (!replacing
 								|| PrivacyManager.getSettingBool(null, context, uid, PrivacyManager.cSettingNotify,
 										true, false)) {
-							// Build result intent
-							Intent resultIntent = new Intent(context, ActivityApp.class);
+							Intent resultIntent = new Intent(Intent.ACTION_MAIN);
 							resultIntent.putExtra(ActivityApp.cPackageName, packageName);
-							resultIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+							resultIntent.setClass(context.getApplicationContext(), ActivityApp.class);
 
 							// Build pending intent
 							PendingIntent pendingIntent = PendingIntent.getActivity(context, uid, resultIntent,
 									PendingIntent.FLAG_UPDATE_CURRENT);
 
 							// Build result intent clear
-							Intent resultIntentClear = new Intent(context, ActivityApp.class);
+							Intent resultIntentClear = new Intent(Intent.ACTION_MAIN);
 							resultIntentClear.putExtra(ActivityApp.cPackageName, packageName);
 							resultIntentClear.putExtra(ActivityApp.cActionClear, true);
-							resultIntentClear.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+							resultIntentClear.setClass(context.getApplicationContext(), ActivityApp.class);
 
 							// Build pending intent clear
 							PendingIntent pendingIntentClear = PendingIntent.getActivity(context, -uid,