From 59088086fde680eb03d222072d9cc8556aa6ccd3 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Mon, 6 Jul 2015 23:48:35 +0200
Subject: [PATCH] Version bump to 0.8.1

* use slf4j-android as it's required by ical4j/2
* disable i18n lint warnings
* retain ServerInfo when activity is re-created (fixes #543)
---
 app/build.gradle                                    |  2 ++
 app/proguard-rules.txt                              |  3 +++
 app/src/main/AndroidManifest.xml                    |  2 +-
 .../main/java/at/bitfire/davdroid/Constants.java    |  2 +-
 .../at/bitfire/davdroid/resource/ServerInfo.java    | 10 +++++++---
 .../davdroid/ui/setup/AddAccountActivity.java       | 13 +++++++++++--
 .../davdroid/ui/setup/SelectCollectionsAdapter.java |  1 +
 .../ui/setup/SelectCollectionsFragment.java         |  3 ++-
 app/src/main/res/layout/setup_login_url.xml         |  2 +-
 9 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c11a7c0f..14f2092e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,7 @@ android {
     }
     lintOptions {
     	abortOnError false
+        disable 'ExtraTranslation'
     }
 
     packagingOptions {
@@ -53,6 +54,7 @@ dependencies {
         // we don't need content builders, see https://github.com/ical4j/ical4j/wiki/Groovy
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
     }
+    compile('org.slf4j:slf4j-android:1.7.12')       // slf4j is used by ical4j
     // ez-vcard for parsing/generating VCards
     compile('com.googlecode.ez-vcard:ez-vcard:0.9.6') {
         // hCard functionality not needed
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index 58f4c609..919b0d71 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -32,3 +32,6 @@
 
 # DAVdroid
 -keep class at.bitfire.davdroid.** { *; }	# all DAVdroid code is required
+
+# unneeded libraries
+-dontwarn aQute.**
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21e14846..39b999c0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="at.bitfire.davdroid"
-    android:versionCode="66" android:versionName="0.8.0"
+    android:versionCode="68" android:versionName="0.8.1"
     android:installLocation="internalOnly">
 
     <uses-sdk
diff --git a/app/src/main/java/at/bitfire/davdroid/Constants.java b/app/src/main/java/at/bitfire/davdroid/Constants.java
index 658ac42e..578f477f 100644
--- a/app/src/main/java/at/bitfire/davdroid/Constants.java
+++ b/app/src/main/java/at/bitfire/davdroid/Constants.java
@@ -12,7 +12,7 @@ import net.fortuna.ical4j.model.property.ProdId;
 
 public class Constants {
 	public static final String
-		APP_VERSION = "0.8.0",
+		APP_VERSION = "0.8.1",
 		ACCOUNT_TYPE = "bitfire.at.davdroid",
 		WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
 		WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java b/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
index 90cd5b34..63116ea4 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
@@ -7,6 +7,10 @@
  */
 package at.bitfire.davdroid.resource;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.LinkedList;
@@ -18,7 +22,7 @@ import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor(suppressConstructorProperties=true)
 @Data
-public class ServerInfo {
+public class ServerInfo implements Serializable {
 	final private URI baseURI;
 	final private String userName, password;
 	final boolean authPreemptive;
@@ -38,8 +42,8 @@ public class ServerInfo {
 				return true;
 		return false;
 	}
-	
-	
+
+
 	@RequiredArgsConstructor(suppressConstructorProperties=true)
 	@Data
 	public static class ResourceInfo {
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java
index d3d7b17f..baf41c7f 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java
@@ -20,14 +20,17 @@ import at.bitfire.davdroid.R;
 import at.bitfire.davdroid.resource.ServerInfo;
 
 public class AddAccountActivity extends Activity {
+	final private static String KEY_SERVER_INFO = "serverInfo";
 
 	protected ServerInfo serverInfo;
 
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
+
+		if (savedInstanceState != null)
+			serverInfo = (ServerInfo)savedInstanceState.getSerializable(KEY_SERVER_INFO);
+
 		setContentView(R.layout.setup_add_account);
 		
 		if (savedInstanceState == null) {	// first call
@@ -37,6 +40,12 @@ public class AddAccountActivity extends Activity {
 		}
 	}
 
+	@Override
+	protected void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putSerializable(KEY_SERVER_INFO, serverInfo);
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java
index 54dfa240..7aeb2314 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java
@@ -10,6 +10,7 @@ package at.bitfire.davdroid.ui.setup;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.text.Html;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java
index 447c2908..4fcdd25c 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java
@@ -9,6 +9,7 @@ package at.bitfire.davdroid.ui.setup;
 
 import android.app.ListFragment;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -53,7 +54,7 @@ public class SelectCollectionsFragment extends ListFragment {
 		
 		View header = getActivity().getLayoutInflater().inflate(R.layout.setup_select_collections_header, getListView(), false);
 		listView.addHeaderView(header, getListView(), false);
-		
+
 		final SelectCollectionsAdapter adapter = new SelectCollectionsAdapter(view.getContext(), serverInfo);
 		setListAdapter(adapter);
 		
diff --git a/app/src/main/res/layout/setup_login_url.xml b/app/src/main/res/layout/setup_login_url.xml
index 4d7da0da..e580dbe7 100644
--- a/app/src/main/res/layout/setup_login_url.xml
+++ b/app/src/main/res/layout/setup_login_url.xml
@@ -39,7 +39,7 @@
             android:layout_width="0dp"
             android:scrollHorizontally="true"
             android:scrollbars="horizontal"
-            android:hint="my.webhost.com/">
+            android:hint="my.webhost.com">
             <requestFocus />
         </EditText>