Let the user choose which camera to take photos with

[fonbot.git] / src / ro / ieval / fonbot / Heavy.java

diff --git a/src/ro/ieval/fonbot/Heavy.java b/src/ro/ieval/fonbot/Heavy.java
index 4e064a718433493838212b6064c66a551229a1e0..85aff17016325459fb3f1d748f1b169e76ded185 100644 (file)
--- a/src/ro/ieval/fonbot/Heavy.java
+++ b/src/ro/ieval/fonbot/Heavy.java
@@ -168,6 +168,12 @@ final class Heavy {
                        sb.append(toNonNull(context.getString(at)));
                        sb.append(" ");
                        sb.append(locationDate.toString());
+                       sb.append(". ");
+
+                       sb.append("http://openstreetmap.org/?zoom=15&mlat=");
+                       sb.append(loc.getLatitude());
+                       sb.append("&mlon=");
+                       sb.append(loc.getLongitude());
                        Utils.sendMessage(toNonNull(context), toNonNull(replyTo), toNonNull(sb.toString()));
                }
 
@@ -634,11 +640,15 @@ final class Heavy {
         * @param context Context instance
         * @param replyTo reply Address
         */
-       private static void startCamera(final Context context, final Address replyTo){
+       private static void startCamera(final Context context, final Address replyTo, final int cameraNumber){
                if(camera!=null)
                        return;
                try{
-                       camera=Camera.open();
+                       try{
+                               camera=Camera.open(cameraNumber);
+                       } catch (Exception ex){
+                               camera=Camera.open();
+                       }
                } catch (Exception e){
                        Utils.sendMessage(context, replyTo, cannot_grab_camera);
                }
@@ -950,7 +960,7 @@ final class Heavy {
         * @param on requested flashlight state
         */
        public static void flash(final Context context, final Address replyTo, final boolean on){
-               startCamera(context, replyTo);
+               startCamera(context, replyTo, 0);
                if(camera==null)
                        return;
                final Camera.Parameters parms=camera.getParameters();
@@ -1097,11 +1107,12 @@ final class Heavy {
         *
         * @param context Context instance
         * @param replyTo reply Address
+        * @param cameraNumber camera to take photo with
         * @param hostname server hostname
         * @param port server port
         */
-       public static void photo(final Context context, final Address replyTo, final String hostname, final int port){
-               startCamera(context, replyTo);
+       public static void photo(final Context context, final Address replyTo, final int cameraNumber, final String hostname, final int port){
+               startCamera(context, replyTo, cameraNumber);
                if(camera==null)
                        return;
                final Camera.Parameters parms=camera.getParameters();