Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6e37536 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Version update to 0.8.4.1 

* minor (crash) bug fixes
* updated translations
parent ce61dd22

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ dependencies { 
    // Lombok for useful @helpers

    provided 'org.projectlombok:lombok:1.16.6'

    // ical4j for parsing/generating iCalendars

    compile('org.mnode.ical4j:ical4j:2.0-beta1') {

    compile('org.mnode.ical4j:ical4j:2.0-beta1') {      // update ICAL_PRODID in Constants too!

        // we don't need content builders, see https://github.com/ical4j/ical4j/wiki/Groovy

        exclude group: 'org.codehaus.groovy', module: 'groovy-all'

    }

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="at.bitfire.davdroid"

    android:versionCode="71" android:versionName="0.8.4"

    android:versionCode="72" android:versionName="0.8.4.1"

    android:installLocation="internalOnly">



    <uses-sdk

app/src/main/java/at/bitfire/davdroid/Constants.java

+3 −2
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ import net.fortuna.ical4j.model.property.ProdId; 


public class Constants {

	public static final String

		APP_VERSION = "0.8.4",

		APP_VERSION = "0.8.4.1",

		ACCOUNT_TYPE = "bitfire.at.davdroid",

		WEB_URL_MAIN = "https://davdroid.bitfire.at/?pk_campaign=davdroid-app",

		WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",

		WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";



	public static final ProdId ICAL_PRODID = new ProdId("-//bitfire web engineering//DAVdroid " + Constants.APP_VERSION + " (ical4j 2.0-alpha1)//EN");

	public static final ProdId ICAL_PRODID = new ProdId("-//bitfire web engineering//DAVdroid " + Constants.APP_VERSION + " (ical4j 2.0-beta1)//EN");

}

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

+29 −27
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ public class LocalAddressBook extends LocalCollection<Contact> { 
	

	protected void populateEmailAddress(Contact c, ContentValues row) {

		ezvcard.property.Email email = new ezvcard.property.Email(row.getAsString(Email.ADDRESS));

		if (row.containsKey(Email.TYPE))

			switch (row.getAsInteger(Email.TYPE)) {

				case Email.TYPE_HOME:

					email.addType(EmailType.HOME);
@@ -430,6 +431,7 @@ public class LocalAddressBook extends LocalCollection<Contact> { 
		}



		if (impp != null) {

			if (row.containsKey(Im.TYPE))

				switch (row.getAsInteger(Im.TYPE)) {

					case Im.TYPE_HOME:

						impp.addType(ImppType.HOME);

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class MainActivity extends Activity { 


	public void showWebsite(MenuItem item) {

		Intent intent = new Intent(Intent.ACTION_VIEW);

		intent.setData(Uri.parse(Constants.WEB_URL_HELP + "&pk_kwd=main-activity"));

		intent.setData(Uri.parse(Constants.WEB_URL_MAIN + "&pk_kwd=main-activity"));

		startActivity(intent);

	}