diff options
Diffstat (limited to 'libs/MemorizingTrustManager')
5 files changed, 18 insertions, 13 deletions
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index dc2e7b603..25dfabeb0 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.1.0' } } diff --git a/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/JULHandler.java b/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/JULHandler.java index 40f71f580..6d183eb60 100644 --- a/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/JULHandler.java +++ b/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/JULHandler.java @@ -1,5 +1,7 @@ package de.duenndns.mtmexample; +import android.util.Log; + import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -12,8 +14,6 @@ import java.util.logging.LogManager; import java.util.logging.LogRecord; import java.util.logging.Logger; -import android.util.Log; - /** * A <code>java.util.logging</code> (JUL) Handler for Android. * <p> diff --git a/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/MTMExample.java b/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/MTMExample.java index 0d16ae82f..52e20dff6 100644 --- a/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/MTMExample.java +++ b/libs/MemorizingTrustManager/example/src/de/duenndns/mtmexample/MTMExample.java @@ -18,8 +18,8 @@ import java.util.ArrayList; import java.util.Collections; import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLContext; import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; import javax.net.ssl.X509TrustManager; import de.duenndns.ssl.MemorizingTrustManager; diff --git a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java index 013ac29b5..567c2d817 100644 --- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java +++ b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java @@ -24,16 +24,17 @@ package de.duenndns.ssl; -import java.util.logging.Level; -import java.util.logging.Logger; - import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; -import android.content.DialogInterface.*; +import android.content.DialogInterface.OnCancelListener; +import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Bundle; +import java.util.logging.Level; +import java.util.logging.Logger; + public class MemorizingActivity extends Activity implements OnClickListener,OnCancelListener { diff --git a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java index 4aa17e04f..d1a7e341a 100644 --- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java +++ b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java @@ -30,27 +30,31 @@ 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.app.Service; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.util.SparseArray; import android.os.Handler; +import android.util.SparseArray; import java.io.File; import java.io.IOException; -import java.security.cert.*; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.MessageDigest; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Enumeration; import java.util.List; import java.util.Locale; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; |