Show all calendars if nothing has been saved yet

breber · Jun 14, 2014 · f55f12b · f55f12b
1 parent 37935f7
commit f55f12b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Agenda/Agenda/src/main/AndroidManifest.xml b/Agenda/Agenda/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.reber.agenda"
-    android:versionCode="28"
+    android:versionCode="29"
     android:versionName="2.3.0">
 
     <uses-permission android:name="android.permission.READ_CALENDAR" />

diff --git a/Agenda/Agenda/src/main/java/org/reber/agenda/util/CalendarUtilities.java b/Agenda/Agenda/src/main/java/org/reber/agenda/util/CalendarUtilities.java
@@ -131,11 +131,9 @@ public Set<org.reber.agenda.AndroidCalendar> getSelectedCalendarFromPref(String
 
         Set<String> string = pref.getStringSet(Constants.CAL_PREFS, null);
 
-        if (string != null) {
-            for (AndroidCalendar c : getAvailableCalendars()) {
-                if (string.contains(c.getId())) {
-                    calsFromPref.add(c);
-                }
+        for (AndroidCalendar c : getAvailableCalendars()) {
+            if (string == null || string.contains(c.getId())) {
+                calsFromPref.add(c);
             }
         }