diff --git a/app/build.gradle b/app/build.gradle
index a33f2456..84f7a36c 100644
--- a/app/build.gradle
+++ b/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"
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c2970f9a..f66723cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,11 +39,11 @@
tools:ignore="UnusedAttribute"/>
-
+
-
+
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
index aa7e4f2c..d480387e 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
+++ b/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;
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7b82cda5..62f26771 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -8,6 +8,7 @@
Enviar
No mostrar de nuevo
+ Versión candidata final de DAVdroid
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.
Dar retroalimentación
Información de código abierto
diff --git a/vcard4android b/vcard4android
index 02eae2c0..61ed6675 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 02eae2c067c8fca4a9cf9f0e324af9bb4b91d3d0
+Subproject commit 61ed667572b0feed32503d912557360371794a59