From b3dda2c112d8c5296210278b59336e8453a68de7 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Tue, 18 Oct 2016 00:30:37 +0200
Subject: [PATCH] ProGuard update; signing config

---
 app/proguard-rules.txt | 33 ++++++++++++++-------------------
 cert4android           |  2 +-
 ical4android           |  2 +-
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index c693f92c..e3581e46 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -1,9 +1,9 @@
 
 # ProGuard usage for DAVdroid:
-# 	shrinking		yes (main reason for using ProGuard)
-# 	optimization		yes
-# 	obfuscation		no (DAVdroid is open-source)
-# 	preverification		no
+#       shrinking        yes (main reason for using ProGuard)
+#       optimization     yes
+#       obfuscation      no (DAVdroid is open-source)
+#       preverification  no
 
 -dontobfuscate
 
@@ -13,30 +13,25 @@
 -dontpreverify
 
 # ez-vcard
--dontwarn ezvcard.io.json.**			# JSON serializer (for jCards) not used
--dontwarn freemarker.**				# freemarker templating library (for creating hCards) not used
--dontwarn org.jsoup.**				# jsoup library (for hCard parsing) not used
+-dontwarn ezvcard.io.json.**            # JSON serializer (for jCards) not used
+-dontwarn freemarker.**                 # freemarker templating library (for creating hCards) not used
+-dontwarn org.jsoup.**                  # jsoup library (for hCard parsing) not used
 -dontwarn sun.misc.Perf
--keep class ezvcard.property.** { *; }		# keep all VCard properties (created at runtime)
+-keep class ezvcard.property.** { *; }  # keep all VCard properties (created at runtime)
 
 # ical4j: ignore unused dynamic libraries
 -dontwarn aQute.**
--dontwarn groovy.**				# Groovy-based ContentBuilder not used
+-dontwarn groovy.**                       # Groovy-based ContentBuilder not used
 -dontwarn org.codehaus.groovy.**
--dontwarn org.apache.commons.logging.**		# Commons logging is not available
--dontwarn org.slf4j.**                          # logging
--dontwarn net.fortuna.ical4j.model.**		# ignore warnings from Groovy dependency
--keep class net.fortuna.ical4j.model.** { *; }	# keep all model classes (properties/factories, created at runtime)
+-dontwarn net.fortuna.ical4j.model.**     # ignore warnings from Groovy dependency
+-keep class net.fortuna.ical4j.** { *; }  # keep all model classes (properties/factories, created at runtime)
 
 # okhttp
--dontwarn java.nio.file.**		# not available on Android
+-dontwarn java.nio.file.**   # not available on Android
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 
-# MemorizingTrustManager
--dontwarn de.duenndns.ssl.MemorizingTrustManager
-
 # dnsjava
--dontwarn sun.net.spi.nameservice.**		# not available on Android
+-dontwarn sun.net.spi.nameservice.**   # not available on Android
 
 # DAVdroid + libs
--keep class at.bitfire.** { *; }	# all DAVdroid code is required
+-keep class at.bitfire.** { *; }       # all DAVdroid code is required
diff --git a/cert4android b/cert4android
index 9efc639c..26f01d17 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit 9efc639c04d6d4e9c1480e6c1d81a800e84d3b8a
+Subproject commit 26f01d17e7fc8ee1f933df4332726024509cc221
diff --git a/ical4android b/ical4android
index d049f7b5..1e326a6a 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit d049f7b5e50b7ade2405b16d0ce8ae518160f642
+Subproject commit 1e326a6a729f633504db4410aeb4269199fe999e