Several fixes for calendar add-on

- remove launcher link
- remove activity view, the menu is enough
- add German localized strings
- rename app-name
- add a few TODOs

6 files changed, 27 insertions, 33 deletions

diff --git a/cgeo-calendar/AndroidManifest.xml b/cgeo-calendar/AndroidManifest.xml
index 20dc910..d187891 100644
--- a/cgeo-calendar/AndroidManifest.xml
+++ b/cgeo-calendar/AndroidManifest.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    name="c:geo - calendar (add-on)"
     package="cgeo.calendar"
-    name="c:geo calendar add-on"
     android:versionCode="1"
     android:versionName="1.0" >
+
     <uses-sdk android:minSdkVersion="4" />
-    
-	<uses-permission android:name="android.permission.READ_CALENDAR"/>
-	<uses-permission android:name="android.permission.WRITE_CALENDAR"/>
 
-	<supports-screens
-		android:largeScreens="true"
-		android:normalScreens="true"
-		android:smallScreens="true"
-		android:anyDensity="true" />
-	
-	<application
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true" />
+
+    <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
+            android:label="@string/app_name"
             android:name=".CalendarActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+            <intent-filter >
                 <action android:name="cgeo.calendar.RESERVE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/cgeo-calendar/res/layout/main.xml b/cgeo-calendar/res/layout/main.xml
deleted file mode 100644
index 0b5a876..0000000
--- a/cgeo-calendar/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/app_name" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/cgeo-calendar/res/values-de/strings.xml b/cgeo-calendar/res/values-de/strings.xml
new file mode 100644
index 0000000..d042ba9
--- /dev/null
+++ b/cgeo-calendar/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">c:geo - Kalender (Erweiterung)</string>
+    <string name="calendars">Kalender</string>
+    <string name="event_success">Event zum Kalender hinzugefügt</string>
+    <string name="event_fail">Hinzufügen des Events zum Kalender fehlgeschlagen</string>
+</resources>
\ No newline at end of file
diff --git a/cgeo-calendar/res/values/strings.xml b/cgeo-calendar/res/values/strings.xml
index fd5a75a..b023a56 100644
--- a/cgeo-calendar/res/values/strings.xml
+++ b/cgeo-calendar/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">c:geo calendar addon</string>
+    <string name="app_name">c:geo - calendar (add-on)</string>
     <string name="calendars">Calendars</string>
     <string name="event_success">Event cache added to calendar</string>
     <string name="event_fail">Failed to add event cache to calendar</string>
diff --git a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
index a181fe0..530ecf0 100644
--- a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
+++ b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
@@ -35,7 +35,6 @@ public final class CalendarActivity extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
 
         try {
             uri = getIntent().getData();
@@ -58,6 +57,7 @@ public final class CalendarActivity extends Activity {
             finish();
             return;
         }
+        finish();
     }
 
     private String getParameter(final String paramKey) {
@@ -79,6 +79,7 @@ public final class CalendarActivity extends Activity {
         final String[] projection = new String[] { "_id", "displayName" };
         final Uri calendarProvider = Compatibility.getCalendarProviderURI();
 
+        // TODO: Handle missing provider
         final Cursor cursor = managedQuery(calendarProvider, projection, "selected=1", null, null);
 
         final Map<Integer, String> calendars = new HashMap<Integer, String>();
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 2bdd5e3..954824e 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -526,7 +526,7 @@ public class CacheDetailActivity extends AbstractActivity {
             return true;
         } else if (menuItem == MENU_CALENDAR) {
             addToCalendar();
-            // addToCalendarWithIntent();
+            //addToCalendarWithIntent();
             return true;
         } else if (menuItem == MENU_SHARE) {
             if (cache != null) {
@@ -741,6 +741,7 @@ public class CacheDetailActivity extends AbstractActivity {
                 ICalendar.PARAM_SHORT_DESC, StringUtils.defaultString(cache.getShortDescription())
                 );
 
+        // TODO: Check if addon is installed, if not, tell the user how to get it.
         startActivity(new Intent(ICalendar.INTENT,
                 Uri.parse(ICalendar.URI_SCHEME + "://" + ICalendar.URI_HOST + "?" + params.toString())));
     }