aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSammysHP <sven@sammyshp.de>2013-01-17 15:26:04 -0800
committerSammysHP <sven@sammyshp.de>2013-01-17 15:26:04 -0800
commit9725f3a437d84d52dcab80266664a9ba9818e64f (patch)
treebd65c376c959f9a206d63b11e9d0cd597cb88553
parent37a2d75910512317a8e8a02a0237a5ff04c8d592 (diff)
parent66a297c5568d49ae92f4f569ebfee71882814ec8 (diff)
downloadcgeo-9725f3a437d84d52dcab80266664a9ba9818e64f.zip
cgeo-9725f3a437d84d52dcab80266664a9ba9818e64f.tar.gz
cgeo-9725f3a437d84d52dcab80266664a9ba9818e64f.tar.bz2
Merge pull request #2407 from YraFyra/sendmail
Send message to cacheowner and cachers in logs
-rw-r--r--main/res/values-sv/strings.xml1
-rw-r--r--main/res/values/strings.xml1
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java6
-rw-r--r--main/src/cgeo/geocaching/TrackableActivity.java4
4 files changed, 11 insertions, 1 deletions
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 03400a1..1f968d2 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -783,6 +783,7 @@
<string name="user_menu_view_hidden">Gömda cacher</string>
<string name="user_menu_view_found">Hittade cacher</string>
<string name="user_menu_open_browser">Öppna profil i webbläsaren</string>
+ <string name="user_menu_send_message">Skicka meddelande</string>
<!-- navigation -->
<string name="navigation">Navigering</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 9831059..ee9d9a9 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -793,6 +793,7 @@
<string name="user_menu_view_hidden">Caches hidden</string>
<string name="user_menu_view_found">Caches found</string>
<string name="user_menu_open_browser">Open profile in browser</string>
+ <string name="user_menu_send_message">Send message</string>
<!-- navigation -->
<string name="navigation">Navigation</string>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 8f501b7..6f1c97a 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -842,7 +842,8 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
private void showUserActionsDialog(final CharSequence name) {
final CharSequence[] items = { res.getString(R.string.user_menu_view_hidden),
res.getString(R.string.user_menu_view_found),
- res.getString(R.string.user_menu_open_browser)
+ res.getString(R.string.user_menu_open_browser),
+ res.getString(R.string.user_menu_send_message)
};
AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -860,6 +861,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
case 2:
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.geocaching.com/profile/?u=" + Network.encode(name.toString()))));
return;
+ case 3:
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.geocaching.com/email/?u=" + Network.encode(name.toString()))));
+ return;
default:
break;
}
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index df3c6e4..5e21377 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -216,6 +216,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
menu.add(viewId, 1, 0, res.getString(R.string.user_menu_view_hidden));
menu.add(viewId, 2, 0, res.getString(R.string.user_menu_view_found));
menu.add(viewId, 3, 0, res.getString(R.string.user_menu_open_browser));
+ menu.add(viewId, 4, 0, res.getString(R.string.user_menu_send_message));
}
@Override
@@ -230,6 +231,9 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
case 3:
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.geocaching.com/profile/?u=" + Network.encode(contextMenuUser))));
return true;
+ case 4:
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.geocaching.com/email/?u=" + Network.encode(contextMenuUser))));
+ return true;
default:
return false;
}