Merge branch 'development' into detached-sigs-api

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

1 files changed, 2 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
index 9946d81aa..7e318281d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java
@@ -50,7 +50,7 @@ public class TlsHelper {
         }
     }
 
-    private static Map<String, byte[]> sStaticCA = new HashMap<String, byte[]>();
+    private static Map<String, byte[]> sStaticCA = new HashMap<>();
 
     public static void addStaticCA(String domain, byte[] certificate) {
         sStaticCA.put(domain, certificate);
@@ -120,13 +120,7 @@ public class TlsHelper {
             urlConnection.setSSLSocketFactory(context.getSocketFactory());
 
             return urlConnection;
-        } catch (CertificateException e) {
-            throw new TlsHelperException(e);
-        } catch (NoSuchAlgorithmException e) {
-            throw new TlsHelperException(e);
-        } catch (KeyStoreException e) {
-            throw new TlsHelperException(e);
-        } catch (KeyManagementException e) {
+        } catch (CertificateException | KeyManagementException | KeyStoreException | NoSuchAlgorithmException e) {
             throw new TlsHelperException(e);
         }
     }