arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-22 16:08:13 +00:00
Code Issues Releases Wiki Activity

Support X-ABLabel for custom types

Browse Source 
* vcard4android: support X-ABLabel for custom types
This commit is contained in:
Ricki Hirner 2016-07-01 22:10:20 +02:00
parent aafcc36c4d
commit 41ce609237
5 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/build.gradle
View File

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

4
app/src/main/AndroidManifest.xml
View File

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

37
app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
View File

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

1
app/src/main/res/values-es/strings.xml
View File

@ -8,6 +8,7 @@
<string name="send">Enviar</string> <string name="send">Enviar</string>
<!--startup dialogs--> <!--startup dialogs-->
<string name="startup_dont_show_again">No mostrar de nuevo</string> <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_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_development_version_give_feedback">Dar retroalimentación</string>
<string name="startup_donate">Información de código abierto</string> <string name="startup_donate">Información de código abierto</string>

2
vcard4android

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