X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FUtils.java;h=c425420e84013dfa545d55ff2e6633853304d044;hb=a646935d0f44af999dca8b068aa9568ed5aab988;hp=8548404aa2b62ae1af196f02287313dfe459c1d1;hpb=8a4b2f56957b27e42995f3f63cb4b601a4b87dbf;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/Utils.java b/src/ro/ieval/fonbot/Utils.java
index 8548404..c425420 100644
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -1,28 +1,6 @@
 package ro.ieval.fonbot;
 
-import static ro.ieval.fonbot.R.string.cannot_parse_count;
-import static ro.ieval.fonbot.R.string.cannot_parse_interval;
-import static ro.ieval.fonbot.R.string.cannot_parse_min_distance;
-import static ro.ieval.fonbot.R.string.cannot_parse_min_time;
-import static ro.ieval.fonbot.R.string.cannot_parse_port;
-import static ro.ieval.fonbot.R.string.cannot_parse_provider_allowed_values_are;
-import static ro.ieval.fonbot.R.string.command_disabled;
-import static ro.ieval.fonbot.R.string.could_not_parse_argument_allowed_values_are;
-import static ro.ieval.fonbot.R.string.could_not_parse_ms;
-import static ro.ieval.fonbot.R.string.error_while_processing_command;
-import static ro.ieval.fonbot.R.string.invalid_length_allowed_values_are;
-import static ro.ieval.fonbot.R.string.invalid_ringer_mode_valid_values_are;
-import static ro.ieval.fonbot.R.string.location_tracking_is_active;
-import static ro.ieval.fonbot.R.string.messagetype_should_be_one_of;
-import static ro.ieval.fonbot.R.string.no_such_command_command_list;
-import static ro.ieval.fonbot.R.string.notification_disabled;
-import static ro.ieval.fonbot.R.string.notification_enabled;
-import static ro.ieval.fonbot.R.string.ringing;
-import static ro.ieval.fonbot.R.string.security_exception;
-import static ro.ieval.fonbot.R.string.the_polling_service_is_running;
-import static ro.ieval.fonbot.R.string.the_second_argument_to_wipe_must_be;
-import static ro.ieval.fonbot.R.string.unknown_command;
-import static ro.ieval.fonbot.R.string.wipetype_should_be_one_of;
+import static ro.ieval.fonbot.R.string.*;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -662,18 +640,27 @@ public final class Utils {
 			break;
 
 		case PHOTO:
-			if(args.length!=2){
+			if(args.length!=3){
 				Heavy.help(context, replyTo, toNonNull(Command.PHOTO));
 				break;
 			}
+
+			final int cameraNumber;
+			try{
+				cameraNumber=Integer.parseInt(args[0]);
+			} catch (NumberFormatException e){
+				sendMessage(context, replyTo, cannot_parse_camera_number);
+				break;
+			}
+
 			final int photoPort;
 			try{
-				photoPort=Integer.parseInt(args[1]);
+				photoPort=Integer.parseInt(args[2]);
 			} catch (NumberFormatException e){
 				sendMessage(context, replyTo, cannot_parse_port);
 				break;
 			}
-			Heavy.photo(context, replyTo, toNonNull(args[0]), photoPort);
+			Heavy.photo(context, replyTo, cameraNumber, toNonNull(args[1]), photoPort);
 			break;
 
 		case SETNOTIFICATION: