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

Bug fixes

Browse Source 
* show "Settings" in Android Settings/Accounts again
This commit is contained in:
Ricki Hirner 2015-03-11 14:56:39 +01:00
parent 1acd2e1a55
commit be235c39b0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
View File

@ -33,7 +33,7 @@ import at.bitfire.davdroid.resource.LocalStorageException;
public class LocalCalendarTest extends InstrumentationTestCase { public class LocalCalendarTest extends InstrumentationTestCase {
private static final String private static final String
TAG = "davroid.LocalCalendarTest", TAG = "davroid.test",
calendarName = "DAVdroid_Test"; calendarName = "DAVdroid_Test";
ContentProviderClient providerClient; ContentProviderClient providerClient;
@ -76,13 +76,13 @@ public class LocalCalendarTest extends InstrumentationTestCase {
providerClient = resolver.acquireContentProviderClient(CalendarContract.AUTHORITY); providerClient = resolver.acquireContentProviderClient(CalendarContract.AUTHORITY);
long id; long id;
@Cleanup Cursor cursor = providerClient.query(Calendars.CONTENT_URI, @Cleanup Cursor cursor = providerClient.query(Calendars.CONTENT_URI,
new String[] { Calendars._ID }, new String[]{Calendars._ID},
Calendars.ACCOUNT_TYPE + "=? AND " + Calendars.NAME + "=?", Calendars.ACCOUNT_TYPE + "=? AND " + Calendars.NAME + "=?",
new String[] { CalendarContract.ACCOUNT_TYPE_LOCAL, calendarName }, new String[]{ CalendarContract.ACCOUNT_TYPE_LOCAL, calendarName },
null); null);
if (cursor.moveToNext()) { if (cursor != null && cursor.moveToNext()) {
// found local test calendar // found local test calendar
id = cursor.getLong(0); id = cursor.getLong(0);
Log.d(TAG, "Found test calendar with ID " + id); Log.d(TAG, "Found test calendar with ID " + id);

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

@ -113,6 +113,7 @@
<string name="login_password">Password:</string> <string name="login_password">Password:</string>
<!-- Settings activity -->
<string name="settings_title">Settings</string> <string name="settings_title">Settings</string>
<string name="settings_no_accounts">No DAVdroid accounts found</string> <string name="settings_no_accounts">No DAVdroid accounts found</string>
<string name="settings_authentication">Authentication</string> <string name="settings_authentication">Authentication</string>

4
app/src/main/res/xml/sync_prefs.xml
View File

@ -9,10 +9,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
<PreferenceScreen android:title="@string/settings_title" > <PreferenceScreen android:title="@string/settings_title">
<intent <intent
android:targetPackage="at.bitfire.davdroid" android:targetPackage="at.bitfire.davdroid"
android:targetClass="at.bitfire.davdroid.syncadapter.SettingsActivity" android:targetClass="at.bitfire.davdroid.ui.settings.SettingsActivity"
android:action="ACTION_VIEW" /> android:action="ACTION_VIEW" />
</PreferenceScreen> </PreferenceScreen>