arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-12-23 15:18:14 +00:00
Code Issues Releases Wiki Activity

Remove VCard RFC6868 setting (always enabled now; setting not needed for Posteo compatibility anymore)

Browse Source
This commit is contained in:
Ricki Hirner 2016-10-12 16:41:08 +02:00
parent 520df3654d
commit e7e30e9f2f
7 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ before_script:
- git submodule update --init --recursive
- export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew
- emulator64-arm -avd test -no-skin -no-audio -no-window & wait-for-emulator.sh
- wget https://f-droid.org/repo/org.dmfs.tasks_103.apk && adb install org.dmfs.tasks_103.apk
- wget -q https://f-droid.org/repo/org.dmfs.tasks_103.apk && adb install org.dmfs.tasks_103.apk
cache:
paths:

17
app/src/main/java/at/bitfire/davdroid/AccountSettings.java
View File

@ -61,12 +61,6 @@ public class AccountSettings {
KEY_WIFI_ONLY = "wifi_only", // sync on WiFi only (default: false)
KEY_WIFI_ONLY_SSID = "wifi_only_ssid"; // restrict sync to specific WiFi SSID
/** Whether to use RFC 6868 for VCards
* value = null (not existing) use RFC6868-style encoding (default value)
* "0" don't use RFC 6868-style encoding
*/
private final static String KEY_VCARD_RFC6868 = "vcard_rfc6868";
/** Time range limitation to the past [in days]
value = null default value (DEFAULT_TIME_RANGE_PAST_DAYS)
< 0 (-1) no limit
@ -196,17 +190,6 @@ public class AccountSettings {
}
// CardDAV settings
public boolean getVCardRFC6868() {
return accountManager.getUserData(account, KEY_VCARD_RFC6868) == null;
}
public void setVCardRFC6868(boolean use) {
accountManager.setUserData(account, KEY_VCARD_RFC6868, use ? null : "0");
}
// CalDAV settings
@Nullable

2
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
View File

@ -259,7 +259,7 @@ public class ContactsSyncManager extends SyncManager {
App.log.log(Level.FINE, "Preparing upload of VCard " + resource.getFileName(), contact);
ByteArrayOutputStream os = new ByteArrayOutputStream();
contact.write(hasVCard4 ? VCardVersion.V4_0 : VCardVersion.V3_0, groupMethod, settings.getVCardRFC6868(), os);
contact.write(hasVCard4 ? VCardVersion.V4_0 : VCardVersion.V3_0, groupMethod, true, os);
return RequestBody.create(
hasVCard4 ? DavAddressBook.MIME_VCARD4 : DavAddressBook.MIME_VCARD3_UTF8,

14
app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java
View File

@ -207,20 +207,6 @@ public class AccountSettingsActivity extends AppCompatActivity {
});
// category: CardDAV
final SwitchPreferenceCompat prefRFC6868 = (SwitchPreferenceCompat)findPreference("vcard_rfc6868");
if (syncIntervalContacts != null) {
prefRFC6868.setChecked(settings.getVCardRFC6868());
prefRFC6868.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
settings.setVCardRFC6868((Boolean)o);
refresh();
return false;
}
});
} else
prefRFC6868.setEnabled(false);
final ListPreference prefGroupMethod = (ListPreference)findPreference("contact_group_method");
if (syncIntervalContacts != null) {
prefGroupMethod.setValue(settings.getGroupMethod().name());

1
app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java
View File

@ -219,7 +219,6 @@ public class DebugInfoActivity extends AppCompatActivity implements LoaderManage
if (settings.getSyncWifiOnlySSID() != null)
report.append(", SSID: ").append(settings.getSyncWifiOnlySSID());
report.append("\n [CardDAV] Contact group method: ").append(settings.getGroupMethod())
.append("\n RFC 6868 encoding: ").append(settings.getVCardRFC6868())
.append("\n [CalDAV] Time range (past days): ").append(settings.getTimeRangePastDays())
.append("\n Manage calendar colors: ").append(settings.getManageCalendarColors())
.append("\n");

3
app/src/main/res/values/strings.xml
View File

@ -189,9 +189,6 @@
<item>Groups are separate VCards</item>
<item>Groups are per-contact categories</item>
</string-array>
<string name="settings_rfc6868_for_vcards">Use RFC6868 for VCards</string>
<string name="settings_rfc6868_for_vcards_on">Double quotes can be used in parameter values</string>
<string name="settings_rfc6868_for_vcards_off">Double quotes can\'t be used in parameter values</string>
<string name="settings_caldav">CalDAV</string>
<string name="settings_sync_time_range_past">Past event time limit</string>
<string name="settings_sync_time_range_past_none">All events will be synchronized</string>

7
app/src/main/res/xml/settings_account.xml
View File

@ -76,13 +76,6 @@
android:entries="@array/settings_contact_group_method_entries"
android:entryValues="@array/settings_contact_group_method_values"/>
<SwitchPreferenceCompat
android:key="vcard_rfc6868"
android:persistent="false"
android:title="@string/settings_rfc6868_for_vcards"
android:summaryOn="@string/settings_rfc6868_for_vcards_on"
android:summaryOff="@string/settings_rfc6868_for_vcards_off"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_caldav">