diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-22 18:58:20 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-22 18:58:20 +0200 |
| commit | 1f4ea552cdfefbb731b8b9848a77445b11abfdd9 (patch) | |
| tree | 88011b2488181bb1977b4c9e7b2179018ec1431d | |
| parent | 4607e2c546fec78d7ae0ca8ce779a2267e6edbe2 (diff) | |
some cleanup
| -rw-r--r-- | res/layout/cert_warning.xml | 41 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
2 files changed, 0 insertions, 43 deletions
diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml deleted file mode 100644 index fffe3266..00000000 --- a/res/layout/cert_warning.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="8dp"> - - <TextView - android:id="@+id/hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="#FFe92727" - android:textStyle="bold" - android:textSize="14sp" - android:text="Do not connect unless you know exactly what you are doing" - android:paddingTop="8dp" - android:paddingBottom="8dp"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - android:text="The SHA1 fingerprint is:" /> - - <TextView - android:layout_gravity="center_horizontal" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:id="@+id/sha" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:typeface="monospace" - android:textStyle="bold" - android:textSize="18sp"/> - -</LinearLayout> diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 03d1a48d..a12fb954 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -367,8 +367,6 @@ public class XmppConnectionService extends Service { PRNGFixes.apply(); this.mRandom = new SecureRandom(); this.mMemorizingTrustManager = new MemorizingTrustManager(getApplicationContext()); - this.mMemorizingTrustManager.wrapHostnameVerifier( - new org.apache.http.conn.ssl.StrictHostnameVerifier()); this.databaseBackend = DatabaseBackend .getInstance(getApplicationContext()); this.fileBackend = new FileBackend(getApplicationContext()); |