From e65a1b5f16e44762e4dc1bcf9f133220dcf6fe5f Mon Sep 17 00:00:00 2001 From: R Hirner Date: Sun, 21 Dec 2014 11:03:40 +0100 Subject: [PATCH] Minor code tweaks (by lint) --- app/.gitignore | 1 + app/lint.xml | 2 +- .../davdroid/resource/ContactTest.java | 2 +- .../bitfire/davdroid/resource/EventTest.java | 2 +- .../davdroid/resource/LocalCalendarTest.java | 2 +- .../at/bitfire/davdroid/resource/Contact.java | 3 +- .../at/bitfire/davdroid/resource/Event.java | 5 +- .../davdroid/resource/LocalAddressBook.java | 2 +- .../QueryServerDialogFragment.java | 3 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/target/manifest-merger-release-report.txt | 137 ------------------ 17 files changed, 17 insertions(+), 156 deletions(-) delete mode 100644 app/target/manifest-merger-release-report.txt diff --git a/app/.gitignore b/app/.gitignore index 378eac25..6eeec870 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ build +target diff --git a/app/lint.xml b/app/lint.xml index e9662288..98d6334d 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java index 26ee6b1b..18eda122 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java +++ b/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; diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java index 89afdc1c..61cad7fd 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java +++ b/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; diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java index 6fe5afea..8308e3cb 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java +++ b/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; diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Contact.java b/app/src/main/java/at/bitfire/davdroid/resource/Contact.java index 61835668..0a97b02a 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/Contact.java +++ b/app/src/main/java/at/bitfire/davdroid/resource/Contact.java @@ -127,7 +127,8 @@ public class Contact extends Resource { /* VCard methods */ - @Override + @SuppressWarnings("LoopStatementThatDoesntLoop") + @Override public void parseEntity(InputStream is) throws IOException { VCard vcard = Ezvcard.parse(is).first(); if (vcard == null) diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Event.java b/app/src/main/java/at/bitfire/davdroid/resource/Event.java index f99ca2e9..00cd29f1 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/Event.java +++ b/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 = true; - if (event.getTransparency() == Transp.TRANSPARENT) - opaque = false; + opaque = event.getTransparency() != Transp.TRANSPARENT; organizer = event.getOrganizer(); for (Object o : event.getProperties(Property.ATTENDEE)) diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java index 22fbaa0b..c62891ca 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java @@ -779,7 +779,7 @@ public class LocalAddressBook extends LocalCollection { .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; diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java index b61d1e7a..df5efc82 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java +++ b/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 v; + return inflater.inflate(R.layout.query_server, container, false); } @Override diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 300ce85f..e3f98a75 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -66,7 +66,7 @@ o comprar-lo.

Llicència

-

Copyright (c) 2013 – 2014 Ricki Hirner (bitfire web engineering). Tots els drets reservats. +

Copyright © 2013 – 2014 Ricki Hirner (bitfire web engineering). 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 http://www.gnu.org/licenses/gpl.html. Respecte al Google Play, Samsung diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bdc38a55..2e5b2d8f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -66,7 +66,7 @@ or purchasing it.

License

-

Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering). All rights reserved. +

Copyright © 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering). 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 http://www.gnu.org/licenses/gpl.html. As far as Google Play, Samsung diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 66fc4881..4a24999a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -67,7 +67,7 @@ für DAVdroid spenden oder die App kaufen.

Lizenz

-

Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering), alle Rechte +

Copyright © 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering), alle Rechte vorbehalten. Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License Version 3, 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 diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d9ef9a3f..e74b5833 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -54,7 +54,7 @@ o en comprar la app.

Licencia

-

Copyright (c) 2013 – 2014 Richard Hirner (bitfire web engineering). Todos los derechos reservados. +

Copyright © 2013 – 2014 Ricki Hirner (bitfire web engineering). 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 http://www.gnu.org/licenses/gpl.html. En lo relativo a Google Play or Samsung requieren otras condiciones, éstas han sido descargadas a través de estos servicios.

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 566d4bb1..4591d260 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -59,7 +59,7 @@ Si vous voulez aider ce projet faites un don à DAVdroid ou achetez le

License

-

Copyright (c) 2013 – 2014 Ricki Hirner (bitfire web engineering). All rights reserved. +

Copyright © 2013 – 2014 Ricki Hirner (bitfire web engineering). 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 à http://www.gnu.org/licenses/gpl.html. 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.

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 12429e21..cd464262 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -65,7 +65,7 @@ megvásárlását vagy közvetlen támogatását.

Licenc

-

Copyright (c) 2013 – 2014 Ricki Hirner (bitfire web engineering). Minden jog fenntartva. +

Copyright © 2013 – 2014 Ricki Hirner (bitfire web engineering). 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ő http://www.gnu.org/licenses/gpl.html oldalon. Amennyiben a Google Play, Samsung diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f3812309..b95c17ae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -66,7 +66,7 @@ or purchasing it.

License

-

Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering). All rights reserved. +

Copyright © 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering). 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 http://www.gnu.org/licenses/gpl.html. As far as Google Play, Samsung diff --git a/app/target/manifest-merger-release-report.txt b/app/target/manifest-merger-release-report.txt deleted file mode 100644 index e4cc6773..00000000 --- a/app/target/manifest-merger-release-report.txt +++ /dev/null @@ -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