From 3acf75d5a7bea3115a6a291477d89b38cbfc24db Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Fri, 25 Dec 2015 19:58:06 +0100
Subject: [PATCH] 0.63 beta

---
 app/app.iml                                          | 1 +
 app/build.gradle                                     | 4 ++--
 app/src/main/java/eu/faircode/netguard/Receiver.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 195a5432..70e090c0 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -75,6 +75,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
diff --git a/app/build.gradle b/app/build.gradle
index ff9aef86..34a004c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ model {
             applicationId = "eu.faircode.netguard"
             minSdkVersion.apiLevel = 21
             targetSdkVersion.apiLevel = 23
-            versionCode = 2015122301
-            versionName = "0.62"
+            versionCode = 2015122501
+            versionName = "0.63"
             archivesBaseName = "NetGuard-v$versionName-$versionCode"
         }
     }
diff --git a/app/src/main/java/eu/faircode/netguard/Receiver.java b/app/src/main/java/eu/faircode/netguard/Receiver.java
index e303ab12..8212ea97 100644
--- a/app/src/main/java/eu/faircode/netguard/Receiver.java
+++ b/app/src/main/java/eu/faircode/netguard/Receiver.java
@@ -136,7 +136,7 @@ public class Receiver extends BroadcastReceiver {
             riWifi.putExtra(SinkholeService.EXTRA_PACKAGE, packages[0]);
             riWifi.putExtra(SinkholeService.EXTRA_BLOCKED, !wifi);
 
-            PendingIntent piWifi = PendingIntent.getService(context, 0, riWifi, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent piWifi = PendingIntent.getService(context, uid, riWifi, PendingIntent.FLAG_UPDATE_CURRENT);
             notification.addAction(
                     wifi ? R.drawable.wifi_on : R.drawable.wifi_off,
                     context.getString(wifi ? R.string.title_allow : R.string.title_block),
@@ -150,7 +150,7 @@ public class Receiver extends BroadcastReceiver {
             riOther.putExtra(SinkholeService.EXTRA_UID, uid);
             riOther.putExtra(SinkholeService.EXTRA_PACKAGE, packages[0]);
             riOther.putExtra(SinkholeService.EXTRA_BLOCKED, !other);
-            PendingIntent piOther = PendingIntent.getService(context, 1, riOther, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent piOther = PendingIntent.getService(context, uid + 10000, riOther, PendingIntent.FLAG_UPDATE_CURRENT);
             notification.addAction(
                     other ? R.drawable.other_on : R.drawable.other_off,
                     context.getString(other ? R.string.title_allow : R.string.title_block),