arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-15 20:38:58 +00:00
Code Issues Releases Wiki Activity

2 bug fixes

Browse Source 
* ical4android: enumerate (=synchronize) all task lists and not only the first one
* fix crash bugs when activating external logging without external storage
This commit is contained in:
Ricki Hirner 2015-10-20 12:04:31 +02:00
parent 8f52bf160e
commit 3e2459c85c
No known key found for this signature in database
GPG Key ID: C4A212CF0B2B4566
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ public class TasksSyncAdapterService extends Service {
Constants.log.error("Couldn't enumerate local task lists", e); Constants.log.error("Couldn't enumerate local task lists", e);
} }
Constants.log.info("Calendar sync complete"); Constants.log.info("Task sync complete");
} }
} }

8
app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java
View File

@ -21,6 +21,8 @@ import android.preference.SwitchPreference;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import java.io.File;
import at.bitfire.davdroid.R; import at.bitfire.davdroid.R;
import at.bitfire.davdroid.log.ExternalFileLogger; import at.bitfire.davdroid.log.ExternalFileLogger;
import at.bitfire.davdroid.syncadapter.AccountSettings; import at.bitfire.davdroid.syncadapter.AccountSettings;
@ -141,7 +143,11 @@ public class AccountFragment extends PreferenceFragment {
final SwitchPreference prefLogExternalFile = (SwitchPreference)findPreference("log_external_file"); final SwitchPreference prefLogExternalFile = (SwitchPreference)findPreference("log_external_file");
prefLogExternalFile.setChecked(settings.logToExternalFile()); prefLogExternalFile.setChecked(settings.logToExternalFile());
prefLogExternalFile.setSummaryOn(getString(R.string.settings_log_to_external_file_on, ExternalFileLogger.getDirectory(getActivity()).getPath())); File logDirectory = ExternalFileLogger.getDirectory(getActivity());
prefLogExternalFile.setSummaryOn(logDirectory != null ?
getString(R.string.settings_log_to_external_file_on, logDirectory.getPath()) :
getString(R.string.settings_log_to_external_file_no_external_storage)
);
prefLogExternalFile.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { prefLogExternalFile.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {

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

@ -141,6 +141,7 @@
<string name="settings_log_to_external_file">Log to external file</string> <string name="settings_log_to_external_file">Log to external file</string>
<string name="settings_log_to_external_file_confirmation">External log files will contain private data and be accessible by other apps. Turn off external logging and delete the log files after use.</string> <string name="settings_log_to_external_file_confirmation">External log files will contain private data and be accessible by other apps. Turn off external logging and delete the log files after use.</string>
<string name="settings_log_to_external_file_on">Logs are written to %s (if possible)</string> <string name="settings_log_to_external_file_on">Logs are written to %s (if possible)</string>
<string name="settings_log_to_external_file_no_external_storage">External storage is not available</string>
<string name="settings_log_to_external_file_off">Logs are written to ADB</string> <string name="settings_log_to_external_file_off">Logs are written to ADB</string>
<string name="settings_log_verbose">Verbose logging</string> <string name="settings_log_verbose">Verbose logging</string>
<string name="settings_log_verbose_on">Log synchronization information and network traffic</string> <string name="settings_log_verbose_on">Log synchronization information and network traffic</string>

2
ical4android

@ -1 +1 @@
Subproject commit 3142ae4a02348640cd5b184d1fb931d204f6bc5d Subproject commit 51c5bf4343a8dcc5ff0ce40b59a58ad0fdde2e67