Merge pull request #74 from RoadXY/alpha-development

Update to latest build tools

Author: galadril

libs/MemorizingTrustManager/build.gradle

@@ -10,9 +10,13 @@ buildscript {
 
 apply plugin: 'com.android.library'
 
+dependencies {
+	compile "com.android.support:support-v4:23.0.+"
+}
+
 android {
-	compileSdkVersion 22
-	buildToolsVersion "22.0.1"
+	compileSdkVersion 23
+	buildToolsVersion "23.0.2"
 	//noinspection GroovyAssignabilityCheck
 	defaultConfig {
         	minSdkVersion 7
@@ -32,5 +36,4 @@ android {
 			assets.srcDirs = ['assets']
 		}
 	}
-
-}
+}

libs/MemorizingTrustManager/settings.gradle

@@ -1 +1 @@
-include ':example'
+include ':example'

libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java

@@ -36,6 +36,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
+import android.support.v4.app.NotificationCompat;
 import android.util.SparseArray;
 
 import java.io.File;
@@ -442,7 +443,7 @@ public void checkClientTrusted(X509Certificate[] chain, String authType)
 	public void checkServerTrusted(X509Certificate[] chain, String authType)
 		throws CertificateException
 	{
-		checkCertTrusted(chain, authType, true,true);
+		checkCertTrusted(chain, authType, true, true);
 	}
 
 	public X509Certificate[] getAcceptedIssuers()
@@ -558,19 +559,16 @@ private String hostNameMessage(X509Certificate cert, String hostname) {
 		return si.toString();
 	}
 
-	// We can use Notification.Builder once MTM's minSDK is >= 11
-	@SuppressWarnings("deprecation")
 	void startActivityNotification(Intent intent, int decisionId, String certName) {
-		Notification n = new Notification(android.R.drawable.ic_lock_lock,
-				master.getString(R.string.mtm_notification),
-				System.currentTimeMillis());
 		PendingIntent call = PendingIntent.getActivity(master, 0, intent, 0);
-		n.setLatestEventInfo(master.getApplicationContext(),
-				master.getString(R.string.mtm_notification),
-				certName, call);
-		n.flags |= Notification.FLAG_AUTO_CANCEL;
-
-		notificationManager.notify(NOTIFICATION_ID + decisionId, n);
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(getUI());
+		builder.setSmallIcon(android.R.drawable.ic_lock_lock)
+				.setContentTitle(master.getString(R.string.mtm_notification))
+				.setContentText(certName)
+				.setAutoCancel(true).setWhen(System.currentTimeMillis())
+				.setDefaults(Notification.DEFAULT_LIGHTS | Notification.DEFAULT_VIBRATE | Notification.DEFAULT_SOUND)
+				.setContentIntent(call);
+		notificationManager.notify(NOTIFICATION_ID + decisionId, builder.build());
 	}
 
 	/**

wear/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
     publishNonDefault true
 
     defaultConfig {
@@ -40,8 +40,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.google.android.support:wearable:1.3.0'
-    compile 'com.google.android.gms:play-services-wearable:8.3.0'
-    compile 'com.android.support:recyclerview-v7:23.1.0'
+    compile 'com.google.android.gms:play-services-wearable:8.4.0'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
     compile 'com.google.code.gson:gson:1.7.2'
     compile 'com.squareup.picasso:picasso:2.5.2'
 }