From 30140d7a3ba0fa2f538d3571a22cfcb2cdcd1708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 8 Jan 2014 23:23:32 +0100 Subject: [PATCH] Indenting fixes --- src/org/fdroid/fdroid/FDroidApp.java | 14 +++++++------- src/org/fdroid/fdroid/FDroidCertPins.java | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/org/fdroid/fdroid/FDroidApp.java b/src/org/fdroid/fdroid/FDroidApp.java index 0558d1f25..54d48bb1e 100644 --- a/src/org/fdroid/fdroid/FDroidApp.java +++ b/src/org/fdroid/fdroid/FDroidApp.java @@ -139,19 +139,19 @@ public class FDroidApp extends Application { try { SSLContext sc = SSLContext.getInstance("TLS"); - X509TrustManager defaultTrustManager = null; + X509TrustManager defaultTrustManager = null; - /* - * init a trust manager factory with a null keystore to access the system trust managers - */ + /* + * init a trust manager factory with a null keystore to access the system trust managers + */ TrustManagerFactory tmf = - TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); KeyStore ks = null; tmf.init(ks); TrustManager[] mgrs = tmf.getTrustManagers(); if(mgrs.length > 0 && mgrs[0] instanceof X509TrustManager) - defaultTrustManager = (X509TrustManager) mgrs[0]; + defaultTrustManager = (X509TrustManager) mgrs[0]; /* * compose a chain of trust managers as follows: @@ -173,7 +173,7 @@ public class FDroidApp extends Application { Log.e("FDroid", "Unable to set up trust manager chain. NoSuchAlgorithmException"); } catch (KeyStoreException e) { Log.e("FDroid", "Unable to set up trust manager chain. KeyStoreException"); - } + } } private Context ctx; diff --git a/src/org/fdroid/fdroid/FDroidCertPins.java b/src/org/fdroid/fdroid/FDroidCertPins.java index 09627a0fc..9ecf61847 100644 --- a/src/org/fdroid/fdroid/FDroidCertPins.java +++ b/src/org/fdroid/fdroid/FDroidCertPins.java @@ -24,21 +24,21 @@ import java.util.Arrays; public class FDroidCertPins { public static final String[] DEFAULT_PINS = { - /* - * SubjectDN: CN=f-droid.org, OU=PositiveSSL, OU=Domain Control Validated - * IssuerDN: CN=PositiveSSL CA 2, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB + /* + * SubjectDN: CN=f-droid.org, OU=PositiveSSL, OU=Domain Control Validated + * IssuerDN: CN=PositiveSSL CA 2, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB * Fingerprint: 84B91CDF2312CB9BA7F3BE803783302F8D8C299F * SPKI Pin: 638F93856E1F5EDFCBD40C46D4160CFF21B0713A - */ - "638F93856E1F5EDFCBD40C46D4160CFF21B0713A", - - /* - * SubjectDN: CN=guardianproject.info, OU=Gandi Standard SSL, OU=Domain Control Validated + */ + "638F93856E1F5EDFCBD40C46D4160CFF21B0713A", + + /* + * SubjectDN: CN=guardianproject.info, OU=Gandi Standard SSL, OU=Domain Control Validated * IssuerDN: CN=Gandi Standard SSL CA, O=GANDI SAS, C=FR * Fingerprint: 187C2573E924DFCBFF2A781A2F99D71C6E031828 * SPKI Pin: EB6BBC6C6BAEEA20CB0F3357720D86E0F3A526F4 - */ - "EB6BBC6C6BAEEA20CB0F3357720D86E0F3A526F4", + */ + "EB6BBC6C6BAEEA20CB0F3357720D86E0F3A526F4", }; public static ArrayList PINLIST = null;