fix #2740: Bad title, when invoking c:geo from mail

4 files changed, 13 insertions, 4 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index b78e26e..17fed31 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -44,7 +44,7 @@
 		</activity>
 		<activity
 			android:name=".SearchActivity"
-			android:label="@string/search"
+			android:label="@string/app_name"
 			android:launchMode="singleTop"
 			android:windowSoftInputMode="stateHidden"
 			android:configChanges="keyboardHidden|orientation" >
@@ -106,7 +106,7 @@
 		</activity>
 		<activity
 			android:name=".cgeocaches"
-			android:label="@string/stored_caches_button"
+			android:label="@string/app_name"
 			android:configChanges="keyboardHidden|orientation|screenSize" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -155,7 +155,7 @@
 		</activity>
 		<activity
 				android:name=".CacheDetailActivity"
-				android:label="@string/cache"
+				android:label="@string/app_name"
 				android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
 				<action android:name="wikitudeapi.arcallback" />
@@ -182,7 +182,7 @@
 		</activity>
 		<activity
 				android:name="cgeo.geocaching.TrackableActivity"
-				android:label="@string/trackable"
+				android:label="@string/app_name"
 				android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 44934c0..273aa8c 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -198,6 +198,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.cacheview);
 
+        // set title in code, as the activity needs a hard coded title due to the intent filters
+        setTitle(res.getString(R.string.cache));
+
         String geocode = null;
 
         // TODO Why can it happen that search is not null? onCreate should be called only once and it is not set before.
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 73459e5..cfd6ea9 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -60,6 +60,9 @@ public class SearchActivity extends AbstractActivity {
         setTheme();
         setContentView(R.layout.search);
 
+        // set title in code, as the activity needs a hard coded title due to the intent filters
+        setTitle(res.getString(R.string.search));
+
         init();
     }
 
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 9b6f491..55d693e 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -110,6 +110,9 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.trackable_activity);
 
+        // set title in code, as the activity needs a hard coded title due to the intent filters
+        setTitle(res.getString(R.string.trackable));
+
         // get parameters
         Bundle extras = getIntent().getExtras();
         Uri uri = getIntent().getData();