Minor code tweaks (by lint)

app/.gitignore

@@ -1 +1,2 @@
 build
+target

app/lint.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <issue id="InvalidPackage" severity="warning" />
+    <issue id="InvalidPackage" severity="ignore" />
     <issue id="MissingTranslation" severity="warning" />
 </lint>

app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java

@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  ******************************************************************************/
-package at.bitfire.davdroid.resource.test;
+package at.bitfire.davdroid.resource;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java

@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  ******************************************************************************/
-package at.bitfire.davdroid.resource.test;
+package at.bitfire.davdroid.resource;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java

@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  ******************************************************************************/
-package at.bitfire.davdroid.resource.test;
+package at.bitfire.davdroid.resource;
 
 import java.util.Calendar;
 

app/src/main/java/at/bitfire/davdroid/resource/Contact.java

@@ -127,6 +127,7 @@ public class Contact extends Resource {
 	
 	/* VCard methods */
 
+	@SuppressWarnings("LoopStatementThatDoesntLoop")
     @Override
 	public void parseEntity(InputStream is) throws IOException {
 		VCard vcard = Ezvcard.parse(is).first();

app/src/main/java/at/bitfire/davdroid/resource/Event.java

@@ -180,10 +180,7 @@ public class Event extends Resource {
 			description = event.getDescription().getValue();
 		
 		status = event.getStatus();
-		
+        opaque = event.getTransparency() != Transp.TRANSPARENT;
-		opaque = true;
-		if (event.getTransparency() == Transp.TRANSPARENT)
-			opaque = false;
 		
 		organizer = event.getOrganizer();
 		for (Object o : event.getProperties(Property.ATTENDEE))

app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java

@@ -779,7 +779,7 @@ public class LocalAddressBook extends LocalCollection<Contact> {
 				.withValue(Email.ADDRESS, email.getValue())
 				.withValue(Email.TYPE, typeCode)
 				.withValue(Email.IS_PRIMARY, is_primary ? 1 : 0)
-				.withValue(Phone.IS_SUPER_PRIMARY, is_primary ? 1 : 0);;
+				.withValue(Phone.IS_SUPER_PRIMARY, is_primary ? 1 : 0);
 		if (typeLabel != null)
 			builder = builder.withValue(Email.LABEL, typeLabel);
 		return builder;

app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java

@@ -55,8 +55,7 @@ public class QueryServerDialogFragment extends DialogFragment implements LoaderC
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.query_server, container, false);
+		return inflater.inflate(R.layout.query_server, container, false);
-		return v;
 	}
 
 	@Override

app/src/main/res/values-ca/strings.xml

@@ -66,7 +66,7 @@
 	   o comprar-lo.</p>
 
 	   <h1>Llicència</h1>
-	   <p>Copyright (c) 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Tots els drets reservats.
+	   <p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Tots els drets reservats.
 	   Aquest programa i tots els materials que l\'acompanyen estan disponibles sota els termes de la GNU Public License v3.0 que acompanya
 	   aquesta distribució i està disponible a <a
 	   href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. Respecte al Google Play, Samsung

app/src/main/res/values-cs/strings.xml

@@ -66,7 +66,7 @@
 	   or purchasing it.</p>
 	   
 	   <h1>License</h1>
-	   <p>Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
+	   <p>Copyright © 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
 	   This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 which
 	   accompanies this distribution, and is available at <a
 	   href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. As far as Google Play, Samsung

app/src/main/res/values-de/strings.xml

@@ -67,7 +67,7 @@
 	   <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">für DAVdroid spenden</a> oder die App kaufen.</p>
 	   
 	   <h1>Lizenz</h1>
-	   <p>Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>), alle Rechte
+	   <p>Copyright © 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>), alle Rechte
 	   vorbehalten. Dieses Programm ist freie Software. Sie können es unter den Bedingungen der <a href="http://www.gnu.org/licenses/gpl.html">GNU
 	   General Public License Version 3</a>, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren.
 	   Sofern Google Play oder Samsung Store andere Bedingungen benötigen, gelten für über den jeweiligen Markt heruntergeladene

app/src/main/res/values-es/strings.xml

@@ -54,7 +54,7 @@
 	   o en comprar la app.</p>
 	   
 	   <h1>Licencia</h1>
-	   <p>Copyright (c) 2013 – 2014 Richard Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Todos los derechos reservados.
+	   <p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Todos los derechos reservados.
 	   Este programa y los materiales que la acompañan está disponible bajo las condiciones de la GNU Public License v3.0 que acompaña a esta distribución, y está a tu disposición en <a
 	   href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. En lo relativo a Google Play or Samsung requieren otras condiciones, éstas han sido descargadas a través de estos servicios.</p>
 	   

app/src/main/res/values-fr/strings.xml

@@ -59,7 +59,7 @@
 	   Si vous voulez aider ce projet <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">faites un don à DAVdroid</a> ou achetez le</p>
 	   
 	   <h1>License</h1>
-	   <p>Copyright (c) 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
+	   <p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
 	   Ce programme et les documents qui l\'accompagnent sont mis à disposition sous les termes de la Licence Public GNU v3.0 qui
 	   accompagne cette distribution, et est disponible à <a
 	   href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. En ce qui concerne Google Play ou Samsung Store, les conditions respectives s\'appliquent pour les versions qui sont téléchargées via ces services.</p>

app/src/main/res/values-hu/strings.xml

@@ -65,7 +65,7 @@
         megvásárlását vagy <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">közvetlen
         támogatását</a>.</p>
         <h1>Licenc</h1>
-        <p>Copyright (c) 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Minden jog fenntartva.
+        <p>Copyright © 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). Minden jog fenntartva.
         Ez a program és a kapcsolódó anyagok a GNU Public License v3.0 hatálya alatt állnak, amely részét képezi a jelen csomagnak, és 
         amely elérhető 
         <a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a> oldalon. Amennyiben a Google Play, Samsung

app/src/main/res/values/strings.xml

@@ -66,7 +66,7 @@
 	   or purchasing it.</p>
 	   
 	   <h1>License</h1>
-	   <p>Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
+	   <p>Copyright © 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
 	   This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 which
 	   accompanies this distribution, and is available at <a
 	   href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. As far as Google Play, Samsung

app/target/manifest-merger-release-report.txt

@@ -1,137 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from AndroidManifest.xml:2:1
-	package
-		ADDED from AndroidManifest.xml:3:5
-		INJECTED from AndroidManifest.xml:0:0
-		INJECTED from AndroidManifest.xml:0:0
-	android:versionName
-		ADDED from AndroidManifest.xml:5:5
-	android:versionCode
-		ADDED from AndroidManifest.xml:4:5
-		INJECTED from AndroidManifest.xml:0:0
-		INJECTED from AndroidManifest.xml:0:0
-	xmlns:android
-		ADDED from AndroidManifest.xml:2:11
-	android:installLocation
-		ADDED from AndroidManifest.xml:5:33
-uses-sdk
-ADDED from AndroidManifest.xml:7:5
-	android:targetSdkVersion
-		ADDED from AndroidManifest.xml:9:9
-		INJECTED from AndroidManifest.xml:0:0
-		INJECTED from AndroidManifest.xml:0:0
-	android:minSdkVersion
-		ADDED from AndroidManifest.xml:8:9
-		INJECTED from AndroidManifest.xml:0:0
-		INJECTED from AndroidManifest.xml:0:0
-uses-permission#android.permission.INTERNET
-ADDED from AndroidManifest.xml:11:5
-	android:name
-		ADDED from AndroidManifest.xml:11:22
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from AndroidManifest.xml:12:5
-	android:name
-		ADDED from AndroidManifest.xml:12:22
-uses-permission#android.permission.READ_CONTACTS
-ADDED from AndroidManifest.xml:13:5
-	android:name
-		ADDED from AndroidManifest.xml:13:22
-uses-permission#android.permission.WRITE_CONTACTS
-ADDED from AndroidManifest.xml:14:5
-	android:name
-		ADDED from AndroidManifest.xml:14:22
-uses-permission#android.permission.READ_CALENDAR
-ADDED from AndroidManifest.xml:15:5
-	android:name
-		ADDED from AndroidManifest.xml:15:22
-uses-permission#android.permission.WRITE_CALENDAR
-ADDED from AndroidManifest.xml:16:5
-	android:name
-		ADDED from AndroidManifest.xml:16:22
-uses-permission#android.permission.WRITE_SYNC_SETTINGS
-ADDED from AndroidManifest.xml:17:5
-	android:name
-		ADDED from AndroidManifest.xml:17:22
-application
-ADDED from AndroidManifest.xml:19:5
-	android:process
-		ADDED from AndroidManifest.xml:24:9
-	android:label
-		ADDED from AndroidManifest.xml:22:9
-	android:allowBackup
-		ADDED from AndroidManifest.xml:20:9
-	android:icon
-		ADDED from AndroidManifest.xml:21:9
-	android:theme
-		ADDED from AndroidManifest.xml:23:9
-service#at.bitfire.davdroid.syncadapter.AccountAuthenticatorService
-ADDED from AndroidManifest.xml:25:9
-	android:exported
-		ADDED from AndroidManifest.xml:27:13
-	android:name
-		ADDED from AndroidManifest.xml:26:13
-intent-filter#android.accounts.AccountAuthenticator
-ADDED from AndroidManifest.xml:28:13
-action#android.accounts.AccountAuthenticator
-ADDED from AndroidManifest.xml:29:17
-	android:name
-		ADDED from AndroidManifest.xml:29:25
-meta-data#android.accounts.AccountAuthenticator
-ADDED from AndroidManifest.xml:32:13
-	android:resource
-		ADDED from AndroidManifest.xml:34:17
-	android:name
-		ADDED from AndroidManifest.xml:33:17
-service#at.bitfire.davdroid.syncadapter.ContactsSyncAdapterService
-ADDED from AndroidManifest.xml:36:9
-	android:exported
-		ADDED from AndroidManifest.xml:38:13
-	android:name
-		ADDED from AndroidManifest.xml:37:13
-intent-filter#android.content.SyncAdapter
-ADDED from AndroidManifest.xml:39:13
-action#android.content.SyncAdapter
-ADDED from AndroidManifest.xml:40:17
-	android:name
-		ADDED from AndroidManifest.xml:40:25
-meta-data#android.content.SyncAdapter
-ADDED from AndroidManifest.xml:43:13
-	android:resource
-		ADDED from AndroidManifest.xml:45:17
-	android:name
-		ADDED from AndroidManifest.xml:44:17
-meta-data#android.provider.CONTACTS_STRUCTURE
-ADDED from AndroidManifest.xml:46:13
-	android:resource
-		ADDED from AndroidManifest.xml:48:17
-	android:name
-		ADDED from AndroidManifest.xml:47:17
-service#at.bitfire.davdroid.syncadapter.CalendarsSyncAdapterService
-ADDED from AndroidManifest.xml:50:9
-	android:exported
-		ADDED from AndroidManifest.xml:52:13
-	android:name
-		ADDED from AndroidManifest.xml:51:13
-activity#at.bitfire.davdroid.MainActivity
-ADDED from AndroidManifest.xml:62:9
-	android:label
-		ADDED from AndroidManifest.xml:64:13
-	android:name
-		ADDED from AndroidManifest.xml:63:13
-intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:65:13
-action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:66:17
-	android:name
-		ADDED from AndroidManifest.xml:66:25
-category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:67:17
-	android:name
-		ADDED from AndroidManifest.xml:67:27
-activity#at.bitfire.davdroid.syncadapter.AddAccountActivity
-ADDED from AndroidManifest.xml:70:9
-	android:excludeFromRecents
-		ADDED from AndroidManifest.xml:72:13
-	android:name
-		ADDED from AndroidManifest.xml:71:13