From 38ebb49be8f195c41a30d0da4d91fc2e61846e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 21:33:40 +0200
Subject: Gradle rebase fixes 2 different notifications bug.

---
 app/src/main/AndroidManifest.xml                   | 13 +++++++++--
 .../main/java/se/leap/bitmaskclient/Dashboard.java | 25 +++++++++++-----------
 .../java/se/leap/bitmaskclient/OnBootReceiver.java | 24 +++++++++++++++++++++
 src/se/leap/bitmaskclient/OnBootReceiver.java      | 24 ---------------------
 4 files changed, 47 insertions(+), 39 deletions(-)
 create mode 100644 app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
 delete mode 100644 src/se/leap/bitmaskclient/OnBootReceiver.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2366b82..0d23b069 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
 
     <uses-sdk
@@ -43,7 +43,16 @@
             </intent-filter>
         </service>
 	<service android:name="se.leap.bitmaskclient.ProviderAPI" android:enabled="true"/>
-		
+	
+        <receiver
+            android:name="se.leap.bitmaskclient.OnBootReceiver"
+            android:enabled="true"
+            android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
+          <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+          </intent-filter>
+        </receiver>
+	
         <activity
             android:name="se.leap.openvpn.LaunchVPN"
             android:label="@string/vpn_launch_title" >
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 62a68d2d..3c17ebb8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -116,7 +116,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 				Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
 				updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE);
 				startService(updateEIP);
-				buildDashboard();
+				buildDashboard(false);
 				invalidateOptionsMenu();
 				if(data != null && data.hasExtra(LogInDialog.VERB)) {
 					View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0);
@@ -175,18 +175,17 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		FragmentManager fragMan = getFragmentManager();
 		if ( provider.hasEIP()){
 			EipServiceFragment eipFragment = new EipServiceFragment();
-		    EipServiceFragment eipFragment = new EipServiceFragment();
-		    if (hide_and_turn_on_eip) {		    
-			getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().remove(Dashboard.START_ON_BOOT).commit();			
-			Bundle arguments = new Bundle();
-			arguments.putBoolean(EipServiceFragment.START_ON_BOOT, true);
-			eipFragment.setArguments(arguments);
-		    }
-		    fragMan.beginTransaction().replace(R.id.servicesCollection, eipFragment, EipServiceFragment.TAG).commit();
-
-		    if (hide_and_turn_on_eip) {
-			onBackPressed();
-		    }
+			if (hide_and_turn_on_eip) {		    
+			    getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().remove(Dashboard.START_ON_BOOT).commit();			
+			    Bundle arguments = new Bundle();
+			    arguments.putBoolean(EipServiceFragment.START_ON_BOOT, true);
+			    eipFragment.setArguments(arguments);
+			}
+			fragMan.beginTransaction().replace(R.id.servicesCollection, eipFragment, EipServiceFragment.TAG).commit();
+
+			if (hide_and_turn_on_eip) {
+			    onBackPressed();
+			}
 		}
 	}
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
new file mode 100644
index 00000000..eb196d46
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
@@ -0,0 +1,24 @@
+package se.leap.bitmaskclient;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+
+public class OnBootReceiver extends BroadcastReceiver {
+
+	// Debug: am broadcast -a android.intent.action.BOOT_COMPLETED
+	@Override
+	public void onReceive(Context context, Intent intent) {
+	    if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+		if (!context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE).getString(Provider.KEY, "").isEmpty() && context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE).getBoolean(Dashboard.START_ON_BOOT, false)) {
+		    Intent dashboard_intent = new Intent(context, Dashboard.class);
+		    dashboard_intent.setAction(EIP.ACTION_START_EIP);
+		    dashboard_intent.putExtra(Dashboard.ON_BOOT, true);
+		    dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		    context.startActivity(dashboard_intent);
+		}
+	    }
+	}
+}
diff --git a/src/se/leap/bitmaskclient/OnBootReceiver.java b/src/se/leap/bitmaskclient/OnBootReceiver.java
deleted file mode 100644
index eb196d46..00000000
--- a/src/se/leap/bitmaskclient/OnBootReceiver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package se.leap.bitmaskclient;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-
-public class OnBootReceiver extends BroadcastReceiver {
-
-	// Debug: am broadcast -a android.intent.action.BOOT_COMPLETED
-	@Override
-	public void onReceive(Context context, Intent intent) {
-	    if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-		if (!context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE).getString(Provider.KEY, "").isEmpty() && context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE).getBoolean(Dashboard.START_ON_BOOT, false)) {
-		    Intent dashboard_intent = new Intent(context, Dashboard.class);
-		    dashboard_intent.setAction(EIP.ACTION_START_EIP);
-		    dashboard_intent.putExtra(Dashboard.ON_BOOT, true);
-		    dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-		    context.startActivity(dashboard_intent);
-		}
-	    }
-	}
-}
-- 
cgit v1.2.3