--- a/app/build.gradle	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/build.gradle	Sun Mar 15 21:08:23 2015 +0100
@@ -27,6 +27,7 @@
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile project(":third_parties:memorizingtrustmanager")
     compile 'org.jitsi:org.otr4j:0.22'
 }
 

--- a/app/src/main/java/de/duenndns/ssl/MTMDecision.java	Sun Mar 15 20:41:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/* MemorizingTrustManager - a TrustManager which asks the user about invalid
- *  certificates and memorizes their decision.
- *
- * Copyright (c) 2010 Georg Lukas <georg@op-co.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package de.duenndns.ssl;
-
-class MTMDecision {
-	public final static int DECISION_INVALID	= 0;
-	public final static int DECISION_ABORT		= 1;
-	public final static int DECISION_ONCE		= 2;
-	public final static int DECISION_ALWAYS	= 3;
-
-	int state = DECISION_INVALID;
-}

--- a/app/src/main/java/de/duenndns/ssl/MemorizingActivity.java	Sun Mar 15 20:41:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/* MemorizingTrustManager - a TrustManager which asks the user about invalid
- *  certificates and memorizes their decision.
- *
- * Copyright (c) 2010 Georg Lukas <georg@op-co.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package de.duenndns.ssl;
-
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.*;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.beem.project.beem.R;
-
-public class MemorizingActivity extends Activity
-		implements OnClickListener,OnCancelListener {
-	final static String TAG = "MemorizingActivity";
-
-	int decisionId;
-	String app;
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		Log.d(TAG, "onCreate");
-		super.onCreate(savedInstanceState);
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		Intent i = getIntent();
-		app = i.getStringExtra(MemorizingTrustManager.DECISION_INTENT_APP);
-		decisionId = i.getIntExtra(MemorizingTrustManager.DECISION_INTENT_ID, MTMDecision.DECISION_INVALID);
-		String cert = i.getStringExtra(MemorizingTrustManager.DECISION_INTENT_CERT);
-		Log.d(TAG, "onResume with " + i.getExtras() + " decId=" + decisionId);
-		Log.d(TAG, "data: " + i.getData());
-		new AlertDialog.Builder(this).setTitle(R.string.mtm_accept_cert)
-			.setMessage(cert)
-			.setPositiveButton(R.string.mtm_decision_always, this)
-			.setNeutralButton(R.string.mtm_decision_once, this)
-			.setNegativeButton(R.string.mtm_decision_abort, this)
-			.setOnCancelListener(this)
-			.create().show();
-	}
-
-	void sendDecision(int decision) {
-		Log.d(TAG, "Sending decision to " + app + ": " + decision);
-		Intent i = new Intent(MemorizingTrustManager.DECISION_INTENT + "/" + app);
-		i.putExtra(MemorizingTrustManager.DECISION_INTENT_ID, decisionId);
-		i.putExtra(MemorizingTrustManager.DECISION_INTENT_CHOICE, decision);
-		sendBroadcast(i);
-		finish();
-	}
-
-	// react on AlertDialog button press
-	public void onClick(DialogInterface dialog, int btnId) {
-		int decision;
-		dialog.dismiss();
-		switch (btnId) {
-		case DialogInterface.BUTTON_POSITIVE:
-			decision = MTMDecision.DECISION_ALWAYS;
-			break;
-		case DialogInterface.BUTTON_NEUTRAL:
-			decision = MTMDecision.DECISION_ONCE;
-			break;
-		default:
-			decision = MTMDecision.DECISION_ABORT;
-		}
-		sendDecision(decision);
-	}
-
-	public void onCancel(DialogInterface dialog) {
-		sendDecision(MTMDecision.DECISION_ABORT);
-	}
-}

--- a/app/src/main/java/de/duenndns/ssl/MemorizingTrustManager.java	Sun Mar 15 20:41:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,493 +0,0 @@
-/* MemorizingTrustManager - a TrustManager which asks the user about invalid
- *  certificates and memorizes their decision.
- *
- * Copyright (c) 2010 Georg Lukas <georg@op-co.de>
- *
- * MemorizingTrustManager.java contains the actual trust manager and interface
- * code to create a MemorizingActivity and obtain the results.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package de.duenndns.ssl;
-
-import android.app.Activity;
-import android.app.Application;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.util.Log;
-import android.os.Handler;
-
-import java.io.File;
-import java.security.cert.*;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.MessageDigest;
-import java.util.HashMap;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import com.beem.project.beem.R;
-
-/**
- * A X509 trust manager implementation which asks the user about invalid
- * certificates and memorizes their decision.
- * <p>
- * The certificate validity is checked using the system default X509
- * TrustManager, creating a query Dialog if the check fails.
- * <p>
- * <b>WARNING:</b> This only works if a dedicated thread is used for
- * opening sockets!
- */
-public class MemorizingTrustManager implements X509TrustManager {
-	final static String TAG = "MemorizingTrustManager";
-	public final static String INTERCEPT_DECISION_INTENT = "de.duenndns.ssl.INTERCEPT_DECISION";
-	public final static String INTERCEPT_DECISION_INTENT_LAUNCH = INTERCEPT_DECISION_INTENT + ".launch_intent";
-	final static String DECISION_INTENT = "de.duenndns.ssl.DECISION";
-	final static String DECISION_INTENT_APP    = DECISION_INTENT + ".app";
-	final static String DECISION_INTENT_ID     = DECISION_INTENT + ".decisionId";
-	final static String DECISION_INTENT_CERT   = DECISION_INTENT + ".cert";
-	final static String DECISION_INTENT_CHOICE = DECISION_INTENT + ".decisionChoice";
-	private final static int NOTIFICATION_ID = 100509;
-
-	static String KEYSTORE_DIR = "KeyStore";
-	static String KEYSTORE_FILE = "KeyStore.bks";
-
-	Context master;
-	Activity foregroundAct;
-	NotificationManager notificationManager;
-	private static int decisionId = 0;
-	private static HashMap<Integer, MTMDecision> openDecisions = new HashMap<Integer, MTMDecision>();
-
-	Handler masterHandler;
-	private File keyStoreFile;
-	private KeyStore appKeyStore;
-	private X509TrustManager defaultTrustManager;
-	private X509TrustManager appTrustManager;
-
-	/** Creates an instance of the MemorizingTrustManager class.
-	 *
-	 * You need to supply the application context. This has to be one of:
-	 *    - Application
-	 *    - Activity
-	 *    - Service
-	 *
-	 * The context is used for file management, to display the dialog /
-	 * notification and for obtaining translated strings.
-	 *
-	 * @param m Context for the application.
-	 */
-	public MemorizingTrustManager(Context m) {
-		master = m;
-		masterHandler = new Handler();
-		notificationManager = (NotificationManager)master.getSystemService(Context.NOTIFICATION_SERVICE);
-
-		Application app;
-		if (m instanceof Application) {
-			app = (Application)m;
-		} else if (m instanceof Service) {
-			app = ((Service)m).getApplication();
-		} else if (m instanceof Activity) {
-			app = ((Activity)m).getApplication();
-		} else throw new ClassCastException("MemorizingTrustManager context must be either Activity or Service!");
-
-		File dir = app.getDir(KEYSTORE_DIR, Context.MODE_PRIVATE);
-		keyStoreFile = new File(dir + File.separator + KEYSTORE_FILE);
-
-		appKeyStore = loadAppKeyStore();
-		defaultTrustManager = getTrustManager(null);
-		appTrustManager = getTrustManager(appKeyStore);
-	}
-
-	/**
-	 * Returns a X509TrustManager list containing a new instance of
-	 * TrustManagerFactory.
-	 *
-	 * This function is meant for convenience only. You can use it
-	 * as follows to integrate TrustManagerFactory for HTTPS sockets:
-	 *
-	 * <pre>
-	 *     SSLContext sc = SSLContext.getInstance("TLS");
-	 *     sc.init(null, MemorizingTrustManager.getInstanceList(this),
-	 *         new java.security.SecureRandom());
-	 *     HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-	 * </pre>
-	 * @param c Activity or Service to show the Dialog / Notification
-	 */
-	public static X509TrustManager[] getInstanceList(Context c) {
-		return new X509TrustManager[] { new MemorizingTrustManager(c) };
-	}
-
-	/**
-	 * Binds an Activity to the MTM for displaying the query dialog.
-	 *
-	 * This is useful if your connection is run from a service that is
-	 * triggered by user interaction -- in such cases the activity is
-	 * visible and the user tends to ignore the service notification.
-	 *
-	 * You should never have a hidden activity bound to MTM! Use this
-	 * function in onResume() and @see unbindDisplayActivity in onPause().
-	 *
-	 * @param act Activity to be bound
-	 */
-	public void bindDisplayActivity(Activity act) {
-		foregroundAct = act;
-	}
-
-	/**
-	 * Removes an Activity from the MTM display stack.
-	 *
-	 * Always call this function when the Activity added with
-	 * @see bindDisplayActivity is hidden.
-	 *
-	 * @param act Activity to be unbound
-	 */
-	public void unbindDisplayActivity(Activity act) {
-		// do not remove if it was overridden by a different activity
-		if (foregroundAct == act)
-			foregroundAct = null;
-	}
-
-	/**
-	 * Changes the path for the KeyStore file.
-	 *
-	 * The actual filename relative to the app's directory will be
-	 * <code>app_<i>dirname</i>/<i>filename</i></code>.
-	 *
-	 * @param dirname directory to store the KeyStore.
-	 * @param filename file name for the KeyStore.
-	 */
-	public static void setKeyStoreFile(String dirname, String filename) {
-		KEYSTORE_DIR = dirname;
-		KEYSTORE_FILE = filename;
-	}
-
-	X509TrustManager getTrustManager(KeyStore ks) {
-		try {
-			TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
-			tmf.init(ks);
-			for (TrustManager t : tmf.getTrustManagers()) {
-				if (t instanceof X509TrustManager) {
-					return (X509TrustManager)t;
-				}
-			}
-		} catch (Exception e) {
-			// Here, we are covering up errors. It might be more useful
-			// however to throw them out of the constructor so the
-			// embedding app knows something went wrong.
-			Log.e(TAG, "getTrustManager(" + ks + ")", e);
-		}
-		return null;
-	}
-
-	KeyStore loadAppKeyStore() {
-		KeyStore ks;
-		try {
-			ks = KeyStore.getInstance(KeyStore.getDefaultType());
-		} catch (KeyStoreException e) {
-			Log.e(TAG, "getAppKeyStore()", e);
-			return null;
-		}
-		try {
-			ks.load(null, null);
-			ks.load(new java.io.FileInputStream(keyStoreFile), "MTM".toCharArray());
-		} catch (java.io.FileNotFoundException e) {
-			Log.i(TAG, "getAppKeyStore(" + keyStoreFile + ") - file does not exist");
-		} catch (Exception e) {
-			Log.e(TAG, "getAppKeyStore(" + keyStoreFile + ")", e);
-		}
-		return ks;
-	}
-
-	void storeCert(X509Certificate[] chain) {
-		// add all certs from chain to appKeyStore
-		try {
-			for (X509Certificate c : chain)
-				appKeyStore.setCertificateEntry(c.getSubjectDN().toString(), c);
-		} catch (KeyStoreException e) {
-			Log.e(TAG, "storeCert(" + chain + ")", e);
-			return;
-		}
-		
-		// reload appTrustManager
-		appTrustManager = getTrustManager(appKeyStore);
-
-		// store KeyStore to file
-		try {
-			java.io.FileOutputStream fos = new java.io.FileOutputStream(keyStoreFile);
-			appKeyStore.store(fos, "MTM".toCharArray());
-			fos.close();
-		} catch (Exception e) {
-			Log.e(TAG, "storeCert(" + keyStoreFile + ")", e);
-		}
-	}
-
-	// if the certificate is stored in the app key store, it is considered "known"
-	private boolean isCertKnown(X509Certificate cert) {
-		try {
-			return appKeyStore.getCertificateAlias(cert) != null;
-		} catch (KeyStoreException e) {
-			return false;
-		}
-	}
-
-	private boolean isExpiredException(Throwable e) {
-		do {
-			if (e instanceof CertificateExpiredException)
-				return true;
-			e = e.getCause();
-		} while (e != null);
-		return false;
-	}
-
-	public void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer)
-		throws CertificateException
-	{
-		Log.d(TAG, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
-		try {
-			Log.d(TAG, "checkCertTrusted: trying appTrustManager");
-			if (isServer)
-				appTrustManager.checkServerTrusted(chain, authType);
-			else
-				appTrustManager.checkClientTrusted(chain, authType);
-		} catch (CertificateException ae) {
-			// if the cert is stored in our appTrustManager, we ignore expiredness
-			ae.printStackTrace();
-			if (isExpiredException(ae)) {
-				Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore");
-				return;
-			}
-			if (isCertKnown(chain[0])) {
-				Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore");
-				return;
-			}
-			try {
-				Log.d(TAG, "checkCertTrusted: trying defaultTrustManager");
-				if (isServer)
-					defaultTrustManager.checkServerTrusted(chain, authType);
-				else
-					defaultTrustManager.checkClientTrusted(chain, authType);
-			} catch (CertificateException e) {
-				e.printStackTrace();
-				interact(chain, authType, e);
-			}
-		}
-	}
-
-	public void checkClientTrusted(X509Certificate[] chain, String authType)
-		throws CertificateException
-	{
-		checkCertTrusted(chain, authType, false);
-	}
-
-	public void checkServerTrusted(X509Certificate[] chain, String authType)
-		throws CertificateException
-	{
-		checkCertTrusted(chain, authType, true);
-	}
-
-	public X509Certificate[] getAcceptedIssuers()
-	{
-		Log.d(TAG, "getAcceptedIssuers()");
-		return defaultTrustManager.getAcceptedIssuers();
-	}
-
-	private int createDecisionId(MTMDecision d) {
-		int myId;
-		synchronized(openDecisions) {
-			myId = decisionId;
-			openDecisions.put(myId, d);
-			decisionId += 1;
-		}
-		return myId;
-	}
-
-	private static String hexString(byte[] data) {
-		StringBuffer si = new StringBuffer();
-		for (int i = 0; i < data.length; i++) {
-			si.append(String.format("%02x", data[i]));
-			if (i < data.length - 1)
-				si.append(":");
-		}
-		return si.toString();
-	}
-
-	private static String certHash(final X509Certificate cert, String digest) {
-		try {
-			MessageDigest md = MessageDigest.getInstance(digest);
-			md.update(cert.getEncoded());
-			return hexString(md.digest());
-		} catch (java.security.cert.CertificateEncodingException e) {
-			return e.getMessage();
-		} catch (java.security.NoSuchAlgorithmException e) {
-			return e.getMessage();
-		}
-	}
-
-	private String certChainMessage(final X509Certificate[] chain, CertificateException cause) {
-		Throwable e = cause;
-		Log.d(TAG, "certChainMessage for " + e);
-		StringBuffer si = new StringBuffer();
-		if (e.getCause() != null) {
-			e = e.getCause();
-			si.append(e.getLocalizedMessage());
-			//si.append("\n");
-		}
-		for (X509Certificate c : chain) {
-			si.append("\n\n");
-			si.append(c.getSubjectDN().toString());
-			si.append("\nMD5: ");
-			si.append(certHash(c, "MD5"));
-			si.append("\nSHA1: ");
-			si.append(certHash(c, "SHA-1"));
-			si.append("\nSigned by: ");
-			si.append(c.getIssuerDN().toString());
-		}
-		return si.toString();
-	}
-
-	void startActivityNotification(PendingIntent intent, String certName) {
-		Notification n = new Notification(android.R.drawable.ic_lock_lock,
-				master.getString(R.string.mtm_notification),
-				System.currentTimeMillis());
-		n.setLatestEventInfo(master.getApplicationContext(),
-				master.getString(R.string.mtm_notification),
-				certName, intent);
-		n.flags |= Notification.FLAG_AUTO_CANCEL;
-
-		notificationManager.notify(NOTIFICATION_ID, n);
-	}
-
-	/**
-	 * Returns the top-most entry of the activity stack.
-	 *
-	 * @return the Context of the currently bound UI or the master context if none is bound
-	 */
-	Context getUI() {
-		return (foregroundAct != null) ? foregroundAct : master;
-	}
-
-	BroadcastReceiver launchServiceMode(Intent activityIntent, final String certMessage) {
-		BroadcastReceiver launchNotifReceiver= new BroadcastReceiver() {
-		    public void onReceive(Context ctx, Intent i) {
-			Log.i(TAG, "Interception not done by the application. Send notification");
-			PendingIntent pi = i.getParcelableExtra(INTERCEPT_DECISION_INTENT_LAUNCH);
-			startActivityNotification(pi, certMessage);
-		    }
-		};
-		master.registerReceiver(launchNotifReceiver, new IntentFilter(INTERCEPT_DECISION_INTENT + "/" + master.getPackageName()));
-		PendingIntent call = PendingIntent.getActivity(master, 0, activityIntent, 0);
-		Intent ni = new Intent(INTERCEPT_DECISION_INTENT + "/" + master.getPackageName());
-		ni.putExtra(INTERCEPT_DECISION_INTENT_LAUNCH, call);
-		master.sendOrderedBroadcast(ni, null);
-		return launchNotifReceiver;
-	}
-
-	void interact(final X509Certificate[] chain, String authType, CertificateException cause)
-		throws CertificateException
-	{
-		/* prepare the MTMDecision blocker object */
-		MTMDecision choice = new MTMDecision();
-		final int myId = createDecisionId(choice);
-		final String certMessage = certChainMessage(chain, cause);
-		BroadcastReceiver decisionReceiver = new BroadcastReceiver() {
-			public void onReceive(Context ctx, Intent i) { interactResult(i); }
-		};
-		master.registerReceiver(decisionReceiver, new IntentFilter(DECISION_INTENT + "/" + master.getPackageName()));
-		LaunchRunnable lr = new LaunchRunnable(myId, certMessage);
-		masterHandler.post(lr);
-
-		Log.d(TAG, "openDecisions: " + openDecisions);
-		Log.d(TAG, "waiting on " + myId);
-		try {
-			synchronized(choice) { choice.wait(); }
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		master.unregisterReceiver(decisionReceiver);
-		if (lr.launchNotifReceiver != null)
-			master.unregisterReceiver(lr.launchNotifReceiver);
-		Log.d(TAG, "finished wait on " + myId + ": " + choice.state);
-		switch (choice.state) {
-		case MTMDecision.DECISION_ALWAYS:
-			storeCert(chain);
-		case MTMDecision.DECISION_ONCE:
-			break;
-		default:
-			throw (cause);
-		}
-	}
-
-	public static void interactResult(Intent i) {
-		int decisionId = i.getIntExtra(DECISION_INTENT_ID, MTMDecision.DECISION_INVALID);
-		int choice = i.getIntExtra(DECISION_INTENT_CHOICE, MTMDecision.DECISION_INVALID);
-		Log.d(TAG, "interactResult: " + decisionId + " chose " + choice);
-		Log.d(TAG, "openDecisions: " + openDecisions);
-
-		MTMDecision d;
-		synchronized(openDecisions) {
-			 d = openDecisions.get(decisionId);
-			 openDecisions.remove(decisionId);
-		}
-		if (d == null) {
-			Log.e(TAG, "interactResult: aborting due to stale decision reference!");
-			return;
-		}
-		synchronized(d) {
-			d.state = choice;
-			d.notify();
-		}
-	}
-
-	private class LaunchRunnable implements Runnable {
-		private int myId;
-		private String certMessage;
-		BroadcastReceiver launchNotifReceiver;
-		
-		public LaunchRunnable(final int id, final String certMsg) {
-			myId = id;
-			certMessage = certMsg;
-		}
-		
-		public void run() {
-			Intent ni = new Intent(master, MemorizingActivity.class);
-			ni.setData(Uri.parse(MemorizingTrustManager.class.getName() + "/" + myId));
-			ni.putExtra(DECISION_INTENT_APP, master.getPackageName());
-			ni.putExtra(DECISION_INTENT_ID, myId);
-			ni.putExtra(DECISION_INTENT_CERT, certMessage);
-
-			// we try to directly start the activity and fall back to
-			// making a notification
-			try {
-				getUI().startActivity(ni);
-			} catch (Exception e) {
-				Log.e(TAG, "startActivity: " + e);
-				launchNotifReceiver = launchServiceMode(ni, certMessage);
-			}
-		}
-	}
-	
-}

--- a/app/src/main/java/de/duenndns/ssl/package-info.java	Sun Mar 15 20:41:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-/**
- * This package contains the MemorizingTrustManager library made by Georg.
- * It is a "plugin" for Android Java to allow asking the user about SSL certificates
- * https://github.com/ge0rg/MemorizingTrustManager
- */
-package de.duenndns.ssl;
-

--- a/app/src/main/res/values-cs/strings.xml	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/src/main/res/values-cs/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -282,14 +282,6 @@
 
 	<string name="UpdateButton">Aktualizovat</string>
 
-	<!-- MemorizingTrustManager library -->
-	<string name="mtm_accept_cert">Přijmout neznámý certifikát?</string>
-	<string name="mtm_decision_always">Vždy</string>
-	<string name="mtm_decision_once">Jednou</string>
-	<string name="mtm_decision_abort">Odmítnout</string>
-
-	<string name="mtm_notification">Ověření certifikátu</string>
-
 	<!-- Error messages -->
 
 	<string name="error_login_authentication">Chyba při ověřování, chybné jméno uživatele nebo heslo.</string>

--- a/app/src/main/res/values-de/strings.xml	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/src/main/res/values-de/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -314,14 +314,6 @@
 
 <string name="UpdateButton">Aktualisieren</string>
 
-<!-- MemorizingTrustManager library -->
-<string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
-<string name="mtm_decision_always">Immer</string>
-<string name="mtm_decision_once">Einmalig</string>
-<string name="mtm_decision_abort">Abbrechen</string>
-
-<string name="mtm_notification">Zertifikatprüfung</string>
-
 <!-- Error messages -->
 
 <string name="error_login_authentication">Ein Fehler ist während der Authentifizierung aufgetreten: mangelhafter Benutzername oder Passwort.</string>

--- a/app/src/main/res/values-eu/strings.xml	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/src/main/res/values-eu/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -283,14 +283,6 @@
 
 <string name="UpdateButton">Eguneratu</string>
 
-<!-- MemorizingTrustManager library -->
-<string name="mtm_accept_cert">Ziurtagiri ezezaguna onartu?</string>
-<string name="mtm_decision_always">Beti</string>
-<string name="mtm_decision_once">Behin</string>
-<string name="mtm_decision_abort">Abortatu</string>
-
-<string name="mtm_notification">Ziurtagiriaren egiaztapena</string>
-
 <!-- Error messages -->
 
 <string name="error_login_authentication">Errorea autentifikatzean, erabiltzaile edo pasahitz okerra</string>

--- a/app/src/main/res/values-fr/strings.xml	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/src/main/res/values-fr/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -275,13 +275,7 @@
 
 	<string name="UpdateButton">Mettre à jour</string>
 
-	<!-- MemorizingTrustManager library -->
-	<string name="mtm_accept_cert">Accepter un certificat de sécurité invalide ?</string>
-	<string name="mtm_decision_always">Toujours</string>
-	<string name="mtm_decision_once">Une fois</string>
-	<string name="mtm_decision_abort">Annuler</string>
 
-	<string name="mtm_notification">Certificate Verification</string>
 	
 	<!-- Error messages -->
 	<string name="error_login_authentication">Erreur lors de l\'authenfitication, mauvais login ou password</string>

--- a/app/src/main/res/values-nb/strings.xml	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/src/main/res/values-nb/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -314,14 +314,6 @@
 
 <string name="UpdateButton">Oppdater</string>
 
-<!-- MemorizingTrustManager library -->
-<string name="mtm_accept_cert">Godkjenn ukjent sertifikat</string>
-<string name="mtm_decision_always">Alltid</string>
-<string name="mtm_decision_once">Denne gangen</string>
-<string name="mtm_decision_abort">Avbryt</string>
-
-<string name="mtm_notification">Sertifikatkontroll</string>
-
 <!-- Error messages -->
 
 <string name="error_login_authentication">Feil ved innlogging, feil brukernavn eller passord</string>

--- a/app/src/main/res/values-sv/strings.xml	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/src/main/res/values-sv/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -283,14 +283,6 @@
 
 <string name="UpdateButton">Uppdatera</string>
 
-<!-- MemorizingTrustManager library -->
-<string name="mtm_accept_cert">Acceptera okända certifikat?</string>
-<string name="mtm_decision_always">Alltid</string>
-<string name="mtm_decision_once">Den här gången</string>
-<string name="mtm_decision_abort">Avbryt</string>
-
-<string name="mtm_notification">Certifikatkontroll</string>
-
 <!-- Error messages -->
 
 <string name="error_login_authentication">Fel vid inloggning, fel ID eller lösenord.</string>

--- a/app/src/main/res/values/strings.xml	Sun Mar 15 20:41:17 2015 +0100
+++ b/app/src/main/res/values/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -283,13 +283,6 @@
 
 	<string name="UpdateButton">Update</string>
 
-	<!-- MemorizingTrustManager library -->
-	<string name="mtm_accept_cert">Accept Unknown Certificate?</string>
-	<string name="mtm_decision_always">Always</string>
-	<string name="mtm_decision_once">Once</string>
-	<string name="mtm_decision_abort">Abort</string>
-
-	<string name="mtm_notification">Certificate Verification</string>
 
 	<!-- Error messages -->
 	

--- a/settings.gradle	Sun Mar 15 20:41:17 2015 +0100
+++ b/settings.gradle	Sun Mar 15 21:08:23 2015 +0100
@@ -1,1 +1,1 @@
-include ':app'
+include ':app', ':third_parties:memorizingtrustmanager'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/build.gradle	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.0"
+
+    defaultConfig {
+        minSdkVersion 6
+        targetSdkVersion 21
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/AndroidManifest.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="de.duenndns.ssl">
+</manifest>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/java/de/duenndns/ssl/MTMDecision.java	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,33 @@
+/* MemorizingTrustManager - a TrustManager which asks the user about invalid
+ *  certificates and memorizes their decision.
+ *
+ * Copyright (c) 2010 Georg Lukas <georg@op-co.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package de.duenndns.ssl;
+
+class MTMDecision {
+	public final static int DECISION_INVALID	= 0;
+	public final static int DECISION_ABORT		= 1;
+	public final static int DECISION_ONCE		= 2;
+	public final static int DECISION_ALWAYS	= 3;
+
+	int state = DECISION_INVALID;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/java/de/duenndns/ssl/MemorizingActivity.java	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,95 @@
+/* MemorizingTrustManager - a TrustManager which asks the user about invalid
+ *  certificates and memorizes their decision.
+ *
+ * Copyright (c) 2010 Georg Lukas <georg@op-co.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package de.duenndns.ssl;
+
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.*;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+public class MemorizingActivity extends Activity
+		implements OnClickListener,OnCancelListener {
+	final static String TAG = "MemorizingActivity";
+
+	int decisionId;
+	String app;
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		Log.d(TAG, "onCreate");
+		super.onCreate(savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		Intent i = getIntent();
+		app = i.getStringExtra(MemorizingTrustManager.DECISION_INTENT_APP);
+		decisionId = i.getIntExtra(MemorizingTrustManager.DECISION_INTENT_ID, MTMDecision.DECISION_INVALID);
+		String cert = i.getStringExtra(MemorizingTrustManager.DECISION_INTENT_CERT);
+		Log.d(TAG, "onResume with " + i.getExtras() + " decId=" + decisionId);
+		Log.d(TAG, "data: " + i.getData());
+		new AlertDialog.Builder(this).setTitle(R.string.mtm_accept_cert)
+			.setMessage(cert)
+			.setPositiveButton(R.string.mtm_decision_always, this)
+			.setNeutralButton(R.string.mtm_decision_once, this)
+			.setNegativeButton(R.string.mtm_decision_abort, this)
+			.setOnCancelListener(this)
+			.create().show();
+	}
+
+	void sendDecision(int decision) {
+		Log.d(TAG, "Sending decision to " + app + ": " + decision);
+		Intent i = new Intent(MemorizingTrustManager.DECISION_INTENT + "/" + app);
+		i.putExtra(MemorizingTrustManager.DECISION_INTENT_ID, decisionId);
+		i.putExtra(MemorizingTrustManager.DECISION_INTENT_CHOICE, decision);
+		sendBroadcast(i);
+		finish();
+	}
+
+	// react on AlertDialog button press
+	public void onClick(DialogInterface dialog, int btnId) {
+		int decision;
+		dialog.dismiss();
+		switch (btnId) {
+		case DialogInterface.BUTTON_POSITIVE:
+			decision = MTMDecision.DECISION_ALWAYS;
+			break;
+		case DialogInterface.BUTTON_NEUTRAL:
+			decision = MTMDecision.DECISION_ONCE;
+			break;
+		default:
+			decision = MTMDecision.DECISION_ABORT;
+		}
+		sendDecision(decision);
+	}
+
+	public void onCancel(DialogInterface dialog) {
+		sendDecision(MTMDecision.DECISION_ABORT);
+	}
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/java/de/duenndns/ssl/MemorizingTrustManager.java	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,491 @@
+/* MemorizingTrustManager - a TrustManager which asks the user about invalid
+ *  certificates and memorizes their decision.
+ *
+ * Copyright (c) 2010 Georg Lukas <georg@op-co.de>
+ *
+ * MemorizingTrustManager.java contains the actual trust manager and interface
+ * code to create a MemorizingActivity and obtain the results.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package de.duenndns.ssl;
+
+import android.app.Activity;
+import android.app.Application;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.util.Log;
+import android.os.Handler;
+
+import java.io.File;
+import java.security.cert.*;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+/**
+ * A X509 trust manager implementation which asks the user about invalid
+ * certificates and memorizes their decision.
+ * <p>
+ * The certificate validity is checked using the system default X509
+ * TrustManager, creating a query Dialog if the check fails.
+ * <p>
+ * <b>WARNING:</b> This only works if a dedicated thread is used for
+ * opening sockets!
+ */
+public class MemorizingTrustManager implements X509TrustManager {
+	final static String TAG = "MemorizingTrustManager";
+	public final static String INTERCEPT_DECISION_INTENT = "de.duenndns.ssl.INTERCEPT_DECISION";
+	public final static String INTERCEPT_DECISION_INTENT_LAUNCH = INTERCEPT_DECISION_INTENT + ".launch_intent";
+	final static String DECISION_INTENT = "de.duenndns.ssl.DECISION";
+	final static String DECISION_INTENT_APP    = DECISION_INTENT + ".app";
+	final static String DECISION_INTENT_ID     = DECISION_INTENT + ".decisionId";
+	final static String DECISION_INTENT_CERT   = DECISION_INTENT + ".cert";
+	final static String DECISION_INTENT_CHOICE = DECISION_INTENT + ".decisionChoice";
+	private final static int NOTIFICATION_ID = 100509;
+
+	static String KEYSTORE_DIR = "KeyStore";
+	static String KEYSTORE_FILE = "KeyStore.bks";
+
+	Context master;
+	Activity foregroundAct;
+	NotificationManager notificationManager;
+	private static int decisionId = 0;
+	private static HashMap<Integer, MTMDecision> openDecisions = new HashMap<Integer, MTMDecision>();
+
+	Handler masterHandler;
+	private File keyStoreFile;
+	private KeyStore appKeyStore;
+	private X509TrustManager defaultTrustManager;
+	private X509TrustManager appTrustManager;
+
+	/** Creates an instance of the MemorizingTrustManager class.
+	 *
+	 * You need to supply the application context. This has to be one of:
+	 *    - Application
+	 *    - Activity
+	 *    - Service
+	 *
+	 * The context is used for file management, to display the dialog /
+	 * notification and for obtaining translated strings.
+	 *
+	 * @param m Context for the application.
+	 */
+	public MemorizingTrustManager(Context m) {
+		master = m;
+		masterHandler = new Handler();
+		notificationManager = (NotificationManager)master.getSystemService(Context.NOTIFICATION_SERVICE);
+
+		Application app;
+		if (m instanceof Application) {
+			app = (Application)m;
+		} else if (m instanceof Service) {
+			app = ((Service)m).getApplication();
+		} else if (m instanceof Activity) {
+			app = ((Activity)m).getApplication();
+		} else throw new ClassCastException("MemorizingTrustManager context must be either Activity or Service!");
+
+		File dir = app.getDir(KEYSTORE_DIR, Context.MODE_PRIVATE);
+		keyStoreFile = new File(dir + File.separator + KEYSTORE_FILE);
+
+		appKeyStore = loadAppKeyStore();
+		defaultTrustManager = getTrustManager(null);
+		appTrustManager = getTrustManager(appKeyStore);
+	}
+
+	/**
+	 * Returns a X509TrustManager list containing a new instance of
+	 * TrustManagerFactory.
+	 *
+	 * This function is meant for convenience only. You can use it
+	 * as follows to integrate TrustManagerFactory for HTTPS sockets:
+	 *
+	 * <pre>
+	 *     SSLContext sc = SSLContext.getInstance("TLS");
+	 *     sc.init(null, MemorizingTrustManager.getInstanceList(this),
+	 *         new java.security.SecureRandom());
+	 *     HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+	 * </pre>
+	 * @param c Activity or Service to show the Dialog / Notification
+	 */
+	public static X509TrustManager[] getInstanceList(Context c) {
+		return new X509TrustManager[] { new MemorizingTrustManager(c) };
+	}
+
+	/**
+	 * Binds an Activity to the MTM for displaying the query dialog.
+	 *
+	 * This is useful if your connection is run from a service that is
+	 * triggered by user interaction -- in such cases the activity is
+	 * visible and the user tends to ignore the service notification.
+	 *
+	 * You should never have a hidden activity bound to MTM! Use this
+	 * function in onResume() and @see unbindDisplayActivity in onPause().
+	 *
+	 * @param act Activity to be bound
+	 */
+	public void bindDisplayActivity(Activity act) {
+		foregroundAct = act;
+	}
+
+	/**
+	 * Removes an Activity from the MTM display stack.
+	 *
+	 * Always call this function when the Activity added with
+	 * @see bindDisplayActivity is hidden.
+	 *
+	 * @param act Activity to be unbound
+	 */
+	public void unbindDisplayActivity(Activity act) {
+		// do not remove if it was overridden by a different activity
+		if (foregroundAct == act)
+			foregroundAct = null;
+	}
+
+	/**
+	 * Changes the path for the KeyStore file.
+	 *
+	 * The actual filename relative to the app's directory will be
+	 * <code>app_<i>dirname</i>/<i>filename</i></code>.
+	 *
+	 * @param dirname directory to store the KeyStore.
+	 * @param filename file name for the KeyStore.
+	 */
+	public static void setKeyStoreFile(String dirname, String filename) {
+		KEYSTORE_DIR = dirname;
+		KEYSTORE_FILE = filename;
+	}
+
+	X509TrustManager getTrustManager(KeyStore ks) {
+		try {
+			TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
+			tmf.init(ks);
+			for (TrustManager t : tmf.getTrustManagers()) {
+				if (t instanceof X509TrustManager) {
+					return (X509TrustManager)t;
+				}
+			}
+		} catch (Exception e) {
+			// Here, we are covering up errors. It might be more useful
+			// however to throw them out of the constructor so the
+			// embedding app knows something went wrong.
+			Log.e(TAG, "getTrustManager(" + ks + ")", e);
+		}
+		return null;
+	}
+
+	KeyStore loadAppKeyStore() {
+		KeyStore ks;
+		try {
+			ks = KeyStore.getInstance(KeyStore.getDefaultType());
+		} catch (KeyStoreException e) {
+			Log.e(TAG, "getAppKeyStore()", e);
+			return null;
+		}
+		try {
+			ks.load(null, null);
+			ks.load(new java.io.FileInputStream(keyStoreFile), "MTM".toCharArray());
+		} catch (java.io.FileNotFoundException e) {
+			Log.i(TAG, "getAppKeyStore(" + keyStoreFile + ") - file does not exist");
+		} catch (Exception e) {
+			Log.e(TAG, "getAppKeyStore(" + keyStoreFile + ")", e);
+		}
+		return ks;
+	}
+
+	void storeCert(X509Certificate[] chain) {
+		// add all certs from chain to appKeyStore
+		try {
+			for (X509Certificate c : chain)
+				appKeyStore.setCertificateEntry(c.getSubjectDN().toString(), c);
+		} catch (KeyStoreException e) {
+			Log.e(TAG, "storeCert(" + chain + ")", e);
+			return;
+		}
+		
+		// reload appTrustManager
+		appTrustManager = getTrustManager(appKeyStore);
+
+		// store KeyStore to file
+		try {
+			java.io.FileOutputStream fos = new java.io.FileOutputStream(keyStoreFile);
+			appKeyStore.store(fos, "MTM".toCharArray());
+			fos.close();
+		} catch (Exception e) {
+			Log.e(TAG, "storeCert(" + keyStoreFile + ")", e);
+		}
+	}
+
+	// if the certificate is stored in the app key store, it is considered "known"
+	private boolean isCertKnown(X509Certificate cert) {
+		try {
+			return appKeyStore.getCertificateAlias(cert) != null;
+		} catch (KeyStoreException e) {
+			return false;
+		}
+	}
+
+	private boolean isExpiredException(Throwable e) {
+		do {
+			if (e instanceof CertificateExpiredException)
+				return true;
+			e = e.getCause();
+		} while (e != null);
+		return false;
+	}
+
+	public void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer)
+		throws CertificateException
+	{
+		Log.d(TAG, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
+		try {
+			Log.d(TAG, "checkCertTrusted: trying appTrustManager");
+			if (isServer)
+				appTrustManager.checkServerTrusted(chain, authType);
+			else
+				appTrustManager.checkClientTrusted(chain, authType);
+		} catch (CertificateException ae) {
+			// if the cert is stored in our appTrustManager, we ignore expiredness
+			ae.printStackTrace();
+			if (isExpiredException(ae)) {
+				Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore");
+				return;
+			}
+			if (isCertKnown(chain[0])) {
+				Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore");
+				return;
+			}
+			try {
+				Log.d(TAG, "checkCertTrusted: trying defaultTrustManager");
+				if (isServer)
+					defaultTrustManager.checkServerTrusted(chain, authType);
+				else
+					defaultTrustManager.checkClientTrusted(chain, authType);
+			} catch (CertificateException e) {
+				e.printStackTrace();
+				interact(chain, authType, e);
+			}
+		}
+	}
+
+	public void checkClientTrusted(X509Certificate[] chain, String authType)
+		throws CertificateException
+	{
+		checkCertTrusted(chain, authType, false);
+	}
+
+	public void checkServerTrusted(X509Certificate[] chain, String authType)
+		throws CertificateException
+	{
+		checkCertTrusted(chain, authType, true);
+	}
+
+	public X509Certificate[] getAcceptedIssuers()
+	{
+		Log.d(TAG, "getAcceptedIssuers()");
+		return defaultTrustManager.getAcceptedIssuers();
+	}
+
+	private int createDecisionId(MTMDecision d) {
+		int myId;
+		synchronized(openDecisions) {
+			myId = decisionId;
+			openDecisions.put(myId, d);
+			decisionId += 1;
+		}
+		return myId;
+	}
+
+	private static String hexString(byte[] data) {
+		StringBuffer si = new StringBuffer();
+		for (int i = 0; i < data.length; i++) {
+			si.append(String.format("%02x", data[i]));
+			if (i < data.length - 1)
+				si.append(":");
+		}
+		return si.toString();
+	}
+
+	private static String certHash(final X509Certificate cert, String digest) {
+		try {
+			MessageDigest md = MessageDigest.getInstance(digest);
+			md.update(cert.getEncoded());
+			return hexString(md.digest());
+		} catch (java.security.cert.CertificateEncodingException e) {
+			return e.getMessage();
+		} catch (java.security.NoSuchAlgorithmException e) {
+			return e.getMessage();
+		}
+	}
+
+	private String certChainMessage(final X509Certificate[] chain, CertificateException cause) {
+		Throwable e = cause;
+		Log.d(TAG, "certChainMessage for " + e);
+		StringBuffer si = new StringBuffer();
+		if (e.getCause() != null) {
+			e = e.getCause();
+			si.append(e.getLocalizedMessage());
+			//si.append("\n");
+		}
+		for (X509Certificate c : chain) {
+			si.append("\n\n");
+			si.append(c.getSubjectDN().toString());
+			si.append("\nMD5: ");
+			si.append(certHash(c, "MD5"));
+			si.append("\nSHA1: ");
+			si.append(certHash(c, "SHA-1"));
+			si.append("\nSigned by: ");
+			si.append(c.getIssuerDN().toString());
+		}
+		return si.toString();
+	}
+
+	void startActivityNotification(PendingIntent intent, String certName) {
+		Notification n = new Notification(android.R.drawable.ic_lock_lock,
+				master.getString(R.string.mtm_notification),
+				System.currentTimeMillis());
+		n.setLatestEventInfo(master.getApplicationContext(),
+				master.getString(R.string.mtm_notification),
+				certName, intent);
+		n.flags |= Notification.FLAG_AUTO_CANCEL;
+
+		notificationManager.notify(NOTIFICATION_ID, n);
+	}
+
+	/**
+	 * Returns the top-most entry of the activity stack.
+	 *
+	 * @return the Context of the currently bound UI or the master context if none is bound
+	 */
+	Context getUI() {
+		return (foregroundAct != null) ? foregroundAct : master;
+	}
+
+	BroadcastReceiver launchServiceMode(Intent activityIntent, final String certMessage) {
+		BroadcastReceiver launchNotifReceiver= new BroadcastReceiver() {
+		    public void onReceive(Context ctx, Intent i) {
+			Log.i(TAG, "Interception not done by the application. Send notification");
+			PendingIntent pi = i.getParcelableExtra(INTERCEPT_DECISION_INTENT_LAUNCH);
+			startActivityNotification(pi, certMessage);
+		    }
+		};
+		master.registerReceiver(launchNotifReceiver, new IntentFilter(INTERCEPT_DECISION_INTENT + "/" + master.getPackageName()));
+		PendingIntent call = PendingIntent.getActivity(master, 0, activityIntent, 0);
+		Intent ni = new Intent(INTERCEPT_DECISION_INTENT + "/" + master.getPackageName());
+		ni.putExtra(INTERCEPT_DECISION_INTENT_LAUNCH, call);
+		master.sendOrderedBroadcast(ni, null);
+		return launchNotifReceiver;
+	}
+
+	void interact(final X509Certificate[] chain, String authType, CertificateException cause)
+		throws CertificateException
+	{
+		/* prepare the MTMDecision blocker object */
+		MTMDecision choice = new MTMDecision();
+		final int myId = createDecisionId(choice);
+		final String certMessage = certChainMessage(chain, cause);
+		BroadcastReceiver decisionReceiver = new BroadcastReceiver() {
+			public void onReceive(Context ctx, Intent i) { interactResult(i); }
+		};
+		master.registerReceiver(decisionReceiver, new IntentFilter(DECISION_INTENT + "/" + master.getPackageName()));
+		LaunchRunnable lr = new LaunchRunnable(myId, certMessage);
+		masterHandler.post(lr);
+
+		Log.d(TAG, "openDecisions: " + openDecisions);
+		Log.d(TAG, "waiting on " + myId);
+		try {
+			synchronized(choice) { choice.wait(); }
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		master.unregisterReceiver(decisionReceiver);
+		if (lr.launchNotifReceiver != null)
+			master.unregisterReceiver(lr.launchNotifReceiver);
+		Log.d(TAG, "finished wait on " + myId + ": " + choice.state);
+		switch (choice.state) {
+		case MTMDecision.DECISION_ALWAYS:
+			storeCert(chain);
+		case MTMDecision.DECISION_ONCE:
+			break;
+		default:
+			throw (cause);
+		}
+	}
+
+	public static void interactResult(Intent i) {
+		int decisionId = i.getIntExtra(DECISION_INTENT_ID, MTMDecision.DECISION_INVALID);
+		int choice = i.getIntExtra(DECISION_INTENT_CHOICE, MTMDecision.DECISION_INVALID);
+		Log.d(TAG, "interactResult: " + decisionId + " chose " + choice);
+		Log.d(TAG, "openDecisions: " + openDecisions);
+
+		MTMDecision d;
+		synchronized(openDecisions) {
+			 d = openDecisions.get(decisionId);
+			 openDecisions.remove(decisionId);
+		}
+		if (d == null) {
+			Log.e(TAG, "interactResult: aborting due to stale decision reference!");
+			return;
+		}
+		synchronized(d) {
+			d.state = choice;
+			d.notify();
+		}
+	}
+
+	private class LaunchRunnable implements Runnable {
+		private int myId;
+		private String certMessage;
+		BroadcastReceiver launchNotifReceiver;
+		
+		public LaunchRunnable(final int id, final String certMsg) {
+			myId = id;
+			certMessage = certMsg;
+		}
+		
+		public void run() {
+			Intent ni = new Intent(master, MemorizingActivity.class);
+			ni.setData(Uri.parse(MemorizingTrustManager.class.getName() + "/" + myId));
+			ni.putExtra(DECISION_INTENT_APP, master.getPackageName());
+			ni.putExtra(DECISION_INTENT_ID, myId);
+			ni.putExtra(DECISION_INTENT_CERT, certMessage);
+
+			// we try to directly start the activity and fall back to
+			// making a notification
+			try {
+				getUI().startActivity(ni);
+			} catch (Exception e) {
+				Log.e(TAG, "startActivity: " + e);
+				launchNotifReceiver = launchServiceMode(ni, certMessage);
+			}
+		}
+	}
+	
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/java/de/duenndns/ssl/package-info.java	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,7 @@
+/**
+ * This package contains the MemorizingTrustManager library made by Georg.
+ * It is a "plugin" for Android Java to allow asking the user about SSL certificates
+ * https://github.com/ge0rg/MemorizingTrustManager
+ */
+package de.duenndns.ssl;
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/res/values-cs/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- MemorizingTrustManager library -->
+    <string name="mtm_accept_cert">Přijmout neznámý certifikát?</string>
+    <string name="mtm_decision_always">Vždy</string>
+    <string name="mtm_decision_once">Jednou</string>
+    <string name="mtm_decision_abort">Odmítnout</string>
+
+    <string name="mtm_notification">Ověření certifikátu</string>
+
+</resources>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/res/values-de/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- MemorizingTrustManager library -->
+    <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
+    <string name="mtm_decision_always">Immer</string>
+    <string name="mtm_decision_once">Einmalig</string>
+    <string name="mtm_decision_abort">Abbrechen</string>
+
+    <string name="mtm_notification">Zertifikatprüfung</string>
+
+</resources>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/res/values-eu/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- MemorizingTrustManager library -->
+    <string name="mtm_accept_cert">Ziurtagiri ezezaguna onartu?</string>
+    <string name="mtm_decision_always">Beti</string>
+    <string name="mtm_decision_once">Behin</string>
+    <string name="mtm_decision_abort">Abortatu</string>
+
+    <string name="mtm_notification">Ziurtagiriaren egiaztapena</string>
+
+</resources>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/res/values-fr/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- MemorizingTrustManager library -->
+    <string name="mtm_accept_cert">Accepter un certificat de sécurité invalide ?</string>
+    <string name="mtm_decision_always">Toujours</string>
+    <string name="mtm_decision_once">Une fois</string>
+    <string name="mtm_decision_abort">Annuler</string>
+
+    <string name="mtm_notification">Certificate Verification</string>
+</resources>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/res/values-nb/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- MemorizingTrustManager library -->
+    <string name="mtm_accept_cert">Godkjenn ukjent sertifikat</string>
+    <string name="mtm_decision_always">Alltid</string>
+    <string name="mtm_decision_once">Denne gangen</string>
+    <string name="mtm_decision_abort">Avbryt</string>
+
+    <string name="mtm_notification">Sertifikatkontroll</string>
+
+</resources>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/res/values-sv/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- MemorizingTrustManager library -->
+    <string name="mtm_accept_cert">Acceptera okända certifikat?</string>
+    <string name="mtm_decision_always">Alltid</string>
+    <string name="mtm_decision_once">Den här gången</string>
+    <string name="mtm_decision_abort">Avbryt</string>
+
+    <string name="mtm_notification">Certifikatkontroll</string>
+
+</resources>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/third_parties/memorizingtrustmanager/src/main/res/values/strings.xml	Sun Mar 15 21:08:23 2015 +0100
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- MemorizingTrustManager library -->
+    <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
+    <string name="mtm_decision_always">Always</string>
+    <string name="mtm_decision_once">Once</string>
+    <string name="mtm_decision_abort">Abort</string>
+    <string name="mtm_notification">Certificate Verification</string>
+</resources>