From 195b0a10d96ad358d956381d8a0e423a8dd913c7 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 7 Apr 2013 14:05:05 +0200
Subject: Allow clearing of external apps

---
 src/de/blinkt/openvpn/api/ConfirmDialog.java          | 1 +
 src/de/blinkt/openvpn/api/ExternalAppDatabase.java    | 6 +++---
 src/de/blinkt/openvpn/api/ExternalOpenVPNService.java | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/de/blinkt/openvpn/api')

diff --git a/src/de/blinkt/openvpn/api/ConfirmDialog.java b/src/de/blinkt/openvpn/api/ConfirmDialog.java
index f72f4921..dfd01884 100644
--- a/src/de/blinkt/openvpn/api/ConfirmDialog.java
+++ b/src/de/blinkt/openvpn/api/ConfirmDialog.java
@@ -73,6 +73,7 @@ CompoundButton.OnCheckedChangeListener, DialogInterface.OnClickListener {
 			builder.setNegativeButton(android.R.string.cancel,this);
 			
 			mAlert = builder.create();
+			mAlert.setCanceledOnTouchOutside(false);
 			
 			mAlert.setOnShowListener (new OnShowListener() {
 				
diff --git a/src/de/blinkt/openvpn/api/ExternalAppDatabase.java b/src/de/blinkt/openvpn/api/ExternalAppDatabase.java
index ca348152..e640a13a 100644
--- a/src/de/blinkt/openvpn/api/ExternalAppDatabase.java
+++ b/src/de/blinkt/openvpn/api/ExternalAppDatabase.java
@@ -25,12 +25,12 @@ public class ExternalAppDatabase {
 
 	}
 
-	Set<String> getExtAppList() {
+	public Set<String> getExtAppList() {
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);        
 		Set<String> allowedapps = prefs.getStringSet(PREFERENCES_KEY, new HashSet<String>());
 		return allowedapps;
 	}
-
+	
 	void addApp(String packagename)
 	{
 		Set<String> allowedapps = getExtAppList();
@@ -45,7 +45,7 @@ public class ExternalAppDatabase {
 		prefedit.apply();
 	}
 	
-	void clearAllApiApps() {
+	public void clearAllApiApps() {
 		saveExtAppList(new HashSet<String>());
 	}
 
diff --git a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java
index fff6c34f..9e6ac9f3 100644
--- a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java
+++ b/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java
@@ -244,7 +244,9 @@ public class ExternalOpenVPNService extends Service implements StateListener {
 	@Override
 	public void updateState (String state, String logmessage, int resid, ConnectionStatus level) {
 		mMostRecentState =  new UpdateMessage(state, logmessage, level);
-		mHandler.obtainMessage(SEND_TOALL, mMostRecentState);
+		Message msg = mHandler.obtainMessage(SEND_TOALL, mMostRecentState);
+		msg.sendToTarget();
+		
 	}
 
 	private static final Handler mHandler = new Handler() {
-- 
cgit v1.2.3