From 91234a688ffba2452afabd3b7a5b0ac46e96ae85 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Mon, 30 May 2016 12:02:04 +0200
Subject: [PATCH] Upgrade to okhttp 3.3.1

---
 app/build.gradle                              |  4 ++--
 .../at/bitfire/davdroid/ui/AboutActivity.java | 22 +++++++++----------
 app/src/main/res/layout/about_component.xml   |  7 +++---
 dav4android                                   |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 95d3fd4d..0b141281 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,6 +75,6 @@ dependencies {
 
     // for tests
     testCompile 'junit:junit:4.12'
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.3.0'
-    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.3.0'
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
+    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
 }
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java
index 4afab33d..132120cf 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java
@@ -64,7 +64,7 @@ public class AboutActivity extends AppCompatActivity {
 
     @RequiredArgsConstructor
     private static class ComponentInfo {
-        final String   title, version, website, copyright;
+        final String title, version, website, copyright;
         final int licenseInfo;
         final String licenseTextFile;
     }
@@ -72,32 +72,32 @@ public class AboutActivity extends AppCompatActivity {
     private final static ComponentInfo components[] = {
             new ComponentInfo(
                     "DAVdroid", BuildConfig.VERSION_NAME, "https://davdroid.bitfire.at",
-                    "© " + DateFormatUtils.format(BuildConfig.buildTime, "yyyy") + " Ricki Hirner, Bernhard Stockmann (bitfire web engineering)",
+                    DateFormatUtils.format(BuildConfig.buildTime, "yyyy") + " Ricki Hirner, Bernhard Stockmann (bitfire web engineering)",
                     R.string.about_license_info_no_warranty, "gpl-3.0-standalone.html"
             ), new ComponentInfo(
                     "AmbilWarna", null, "https://github.com/yukuku/ambilwarna",
-                    "© Yuku", R.string.about_license_info_no_warranty, "apache2.html"
+                    "Yuku", R.string.about_license_info_no_warranty, "apache2.html"
             ), new ComponentInfo(
                     "Apache Commons", null, "http://commons.apache.org/",
                     "Apache Software Foundation", R.string.about_license_info_no_warranty, "apache2.html"
             ), new ComponentInfo(
                     "dnsjava", null, "http://dnsjava.org/",
-                    "© Brian Wellington", R.string.about_license_info_no_warranty, "bsd.html"
+                    "Brian Wellington", R.string.about_license_info_no_warranty, "bsd.html"
             ), new ComponentInfo(
                     "ez-vcard", Ezvcard.VERSION, "https://github.com/mangstadt/ez-vcard",
-                    "© Michael Angstadt", R.string.about_license_info_no_warranty, "bsd.html"
+                    "Michael Angstadt", R.string.about_license_info_no_warranty, "bsd.html"
             ), new ComponentInfo(
-                    "ical4j", "2.x", "http://ical4j.github.io/",
-                    "© Ben Fortuna", R.string.about_license_info_no_warranty, "bsd-3clause.html"
+                    "ical4j", "2.x", "https://ical4j.github.io/",
+                    "Ben Fortuna", R.string.about_license_info_no_warranty, "bsd-3clause.html"
             ), new ComponentInfo(
                     "MemorizingTrustManager", null, "https://github.com/ge0rg/MemorizingTrustManager",
-                    "© Georg Lukas", R.string.about_license_info_no_warranty, "mit.html"
+                    "Georg Lukas", R.string.about_license_info_no_warranty, "mit.html"
             ), new ComponentInfo(
                     "OkHttp", null, "https://square.github.io/okhttp/",
-                    "© Square, Inc.", R.string.about_license_info_no_warranty, "apache2.html"
+                    "Square, Inc.", R.string.about_license_info_no_warranty, "apache2.html"
             ), new ComponentInfo(
                     "Project Lombok", null, "https://projectlombok.org/",
-                    "© The Project Lombok Authors", R.string.about_license_info_no_warranty, "mit.html"
+                    "The Project Lombok Authors", R.string.about_license_info_no_warranty, "mit.html"
             )
     };
 
@@ -152,7 +152,7 @@ public class AboutActivity extends AppCompatActivity {
             tv.setText(info.website);
 
             tv = (TextView)v.findViewById(R.id.copyright);
-            tv.setText(info.copyright);
+            tv.setText("© " + info.copyright);
 
             tv = (TextView)v.findViewById(R.id.license_info);
             tv.setText(info.licenseInfo);
diff --git a/app/src/main/res/layout/about_component.xml b/app/src/main/res/layout/about_component.xml
index 1bd423b5..cf45d0c8 100644
--- a/app/src/main/res/layout/about_component.xml
+++ b/app/src/main/res/layout/about_component.xml
@@ -46,10 +46,9 @@
         <TextView
             android:id="@+id/license_info"
             tools:text="This program comes with ABSOLUTELY NO WARRANTY. It is free software, and you are welcome to redistribute it under certain conditions."
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:layout_gravity="center_horizontal"/>
+            android:layout_marginBottom="32dp"/>
 
         <TextView
             android:layout_width="match_parent"
@@ -68,4 +67,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/dav4android b/dav4android
index 7893c474..871d62ff 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 7893c474152290fed83db6f907ed911513d54850
+Subproject commit 871d62fffc45cbe5aa061b4ed2b3bd5282a64dd1