Support X-ABLabel for custom types

* vcard4android: support X-ABLabel for custom types

app/build.gradle

@@ -17,16 +17,17 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionCode 107
-        versionName "1.1.1.2"
+        versionCode 108
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
 
     productFlavors {
-        standard {}
+        standard {
+            versionName "1.1.1.2"
+        }
         gplay {
-            versionName "1.1.1.1-gplay"
+            versionName "1.1.1.2-gplay"
         }
     }
 

app/src/main/AndroidManifest.xml

@@ -39,11 +39,11 @@
         tools:ignore="UnusedAttribute"/>
 
     <!-- other permissions -->
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <!-- android.permission-group.CONTACTS -->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
     <!-- android.permission-group.CALENDAR -->
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
 
     <!-- ical4android declares task access permissions -->

app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java

@@ -111,28 +111,31 @@ public class StartupDialogFragment extends DialogFragment {
                         .setNeutralButton(R.string.startup_development_version_give_feedback, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("forums/beta/").build()));
+                                startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("forums/").build()));
                             }
                         })
                         .create();
 
             case FDROID_DONATE:
-                return new AlertDialog.Builder(getActivity())
-                        .setIcon(R.drawable.ic_launcher)
-                        .setTitle(R.string.startup_donate)
-                        .setMessage(R.string.startup_donate_message)
-                        .setPositiveButton(R.string.startup_donate_now, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build()));
-                            }
-                        })
-                        .setNegativeButton(R.string.startup_donate_later, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                            }
-                        })
-                        .create();
+                if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY)
+                    return new AlertDialog.Builder(getActivity())
+                            .setIcon(R.drawable.ic_launcher)
+                            .setTitle(R.string.startup_donate)
+                            .setMessage(R.string.startup_donate_message)
+                            .setPositiveButton(R.string.startup_donate_now, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build()));
+                                }
+                            })
+                            .setNegativeButton(R.string.startup_donate_later, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                }
+                            })
+                            .create();
+                else
+                    throw new IllegalArgumentException();
 
             case GOOGLE_PLAY_ACCOUNTS_REMOVED:
                 Drawable icon = null;

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

@@ -8,6 +8,7 @@
   <string name="send">Enviar</string>
   <!--startup dialogs-->
   <string name="startup_dont_show_again">No mostrar de nuevo</string>
+  <string name="startup_development_version">Versión candidata final de DAVdroid</string>
   <string name="startup_development_version_message">Esta es una versión de desarrollo de DAVdroid. Tenga presente que puede que no todo funcione como espera. Por favor, denos una retroalimentación constructiva para mejorar DAVdroid.</string>
   <string name="startup_development_version_give_feedback">Dar retroalimentación</string>
   <string name="startup_donate">Información de código abierto</string>

vcard4android

@@ -1 +1 @@
-Subproject commit 02eae2c067c8fca4a9cf9f0e324af9bb4b91d3d0
+Subproject commit 61ed667572b0feed32503d912557360371794a59