La123123.
/
telegram_example
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1. Several fixes

master
Rubenlagu 11 years ago
committed by Rubenlagus
parent
18efda0505
commit
8dcaed4d72
11 changed files with 460 additions and 446 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 582
      .idea/workspace.xml
  2. 14
      src/main/java/org/telegram/api/Message.java
  3. 4
      src/main/java/org/telegram/services/DirectionsService.java
  4. 225
      src/main/java/org/telegram/services/TransifexService.java
  5. 8
      src/main/java/org/telegram/services/WeatherService.java
  6. 7
      src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
  7. 7
      src/main/java/org/telegram/updateshandlers/FilesHandlers.java
  8. 7
      src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
  9. 1
      src/main/java/org/telegram/updateshandlers/UpdatesCallback.java
  10. 7
      src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
  11. 44
      src/main/java/org/telegram/updatesreceivers/UpdatesThread.java

582
.idea/workspace.xml
View File

@ -2,116 +2,17 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Fix JSON deserialization"> <list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Fix JSON deserialization">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/.name" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Audio.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/BotAPi.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Chat.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Commands.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/Constants.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Contact.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/CreationStrings.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/CustomMessages.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Document.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/ForceReply.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/ForwardMessage.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetMe.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUpdates.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUserProfilePhotos.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Location.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_5_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_5_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_5_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_35.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_framework_2_3_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_2_3_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_server_2_3_19.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_servlet_2_2_16.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b12.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b12.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b12.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b12.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b12.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_18.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20141113.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_8_2.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/PhotoSize.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboard.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboardHide.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboardMarkup.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendAudio.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendChatAction.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendDocument.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendLocation.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendMessage.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendPhoto.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendSticker.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendVideo.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SetWebhook.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Sticker.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Update.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/User.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/UserProfilePhotos.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/Video.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/jsLinters/jshint.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="BotAPi.iws" /> <ignored path="BotAPi.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -134,50 +35,7 @@
<favorites_list name="BotAPi" /> <favorites_list name="BotAPi" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf />
<file leaf-file-name="BuildVars.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="5" column="53" selection-start-line="5" selection-start-column="53" selection-end-line="5" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SenderHelper.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.8068181">
<caret line="117" column="12" selection-start-line="117" selection-start-column="12" selection-end-line="117" selection-end-column="12" />
<folding>
<element signature="method#SendDocument#0;class#SenderHelper#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CustomMessages.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/CustomMessages.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="50" column="100" selection-start-line="50" selection-start-column="100" selection-end-line="50" selection-end-column="100" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
@ -211,12 +69,10 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/UpdatesCallback.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/UpdatesCallback.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboard.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboard.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/ForwardMessage.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/ForwardMessage.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendPhoto.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendPhoto.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUserProfilePhotos.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUserProfilePhotos.java" />
@ -225,15 +81,12 @@
<option value="$PROJECT_DIR$/src/main/java/org/telegram/Commands.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/Commands.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/database/CreationStrings.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/CreationStrings.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/UpdatesThread.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/UpdatesThread.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/Server.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/Server.java" />
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/RestApi.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/RestApi.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/UpdateHandler.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/UpdateHandler.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/Webhook.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/Webhook.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Audio.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Audio.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Update.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Update.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Contact.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Contact.java" />
@ -249,19 +102,24 @@
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/GroupChat.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/GroupChat.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Chat.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Chat.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/User.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/User.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendChatAction.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendChatAction.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/CustomMessages.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/CustomMessages.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java" />
</list> </list>
</option> </option>
</component> </component>
@ -393,9 +251,6 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -446,8 +301,127 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="telegram" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="telegram" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="updateshandlers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="telegram" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="services" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="BotAPi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="telegram" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="api" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -863,7 +837,8 @@
<workItem from="1434996082760" duration="12366000" /> <workItem from="1434996082760" duration="12366000" />
<workItem from="1435083767937" duration="474000" /> <workItem from="1435083767937" duration="474000" />
<workItem from="1435087589530" duration="13495000" /> <workItem from="1435087589530" duration="13495000" />
<workItem from="1435164520307" duration="6240000" /> <workItem from="1435164520307" duration="6553000" />
<workItem from="1435251996845" duration="1619000" />
</task> </task>
<task id="LOCAL-00001" summary="First Commit:&#10;1. Transifex bot&#10;2. Weather bot"> <task id="LOCAL-00001" summary="First Commit:&#10;1. Transifex bot&#10;2. Weather bot">
<created>1434854005227</created> <created>1434854005227</created>
@ -977,7 +952,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="91000000" /> <option name="totallyTimeSpent" value="92932000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -999,7 +974,7 @@
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32857144" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -1007,33 +982,33 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39971346" sideWeight="0.5060423" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39971346" sideWeight="0.5060423" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19561933" sideWeight="0.1718377" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19561933" sideWeight="0.1718377" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19561933" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19561933" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3295129" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19561933" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19561933" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@ -1045,8 +1020,8 @@
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
</layout-to-restore> </layout-to-restore>
</component> </component>
@ -1120,11 +1095,17 @@
<properties /> <properties />
<option name="timeStamp" value="83" /> <option name="timeStamp" value="83" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java</url>
<line>321</line>
<properties />
<option name="timeStamp" value="84" />
</line-breakpoint>
</breakpoints> </breakpoints>
<breakpoints-dialog> <breakpoints-dialog>
<breakpoints-dialog /> <breakpoints-dialog />
</breakpoints-dialog> </breakpoints-dialog>
<option name="time" value="84" /> <option name="time" value="86" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
@ -1133,25 +1114,10 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/rt.jar!/sun/invoke/util/VerifyType.class">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/invoke/MethodHandleNatives.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.44757032">
<caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Class.java"> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Class.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33248082"> <state vertical-scroll-proportion="0.33248082">
<caret line="347" column="52" selection-start-line="347" selection-start-column="52" selection-end-line="347" selection-end-column="52" /> <caret line="347" column="52" selection-start-line="347" selection-start-column="52" selection-end-line="347" selection-end-column="52" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1167,7 +1133,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.83120203"> <state vertical-scroll-proportion="0.83120203">
<caret line="176" column="0" selection-start-line="176" selection-start-column="0" selection-end-line="176" selection-end-column="0" /> <caret line="176" column="0" selection-start-line="176" selection-start-column="0" selection-end-line="176" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1175,7 +1140,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="2847" column="0" selection-start-line="2847" selection-start-column="0" selection-end-line="2847" selection-end-column="0" /> <caret line="2847" column="0" selection-start-line="2847" selection-start-column="0" selection-end-line="2847" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1201,39 +1165,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="116" column="0" selection-start-line="116" selection-start-column="0" selection-end-line="116" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.263427">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding>
<element signature="method#getInstance#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#fetchWeatherForecast#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#fetchWeatherForecastByLocation#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#fetchWeatherCurrent#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#fetchWeatherCurrentByLocation#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#convertListOfForecastToString#0;class#WeatherService#0" expanded="false" />
<element signature="method#convertListOfForecastToString#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#convertInternalInformationToString#0;class#WeatherService#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/methods/Constants.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/methods/Constants.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1274,7 +1205,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.32687652"> <state vertical-scroll-proportion="0.32687652">
<caret line="16" column="30" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="30" /> <caret line="16" column="30" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="30" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1282,7 +1212,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.94430995"> <state vertical-scroll-proportion="0.94430995">
<caret line="65" column="11" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="11" /> <caret line="65" column="11" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="11" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1341,7 +1270,7 @@
<state vertical-scroll-proportion="0.7928389"> <state vertical-scroll-proportion="0.7928389">
<caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" /> <caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1350,7 +1279,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3836317"> <state vertical-scroll-proportion="0.3836317">
<caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" /> <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1386,7 +1314,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.56265986"> <state vertical-scroll-proportion="0.56265986">
<caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" /> <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1422,15 +1349,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7314578"> <state vertical-scroll-proportion="0.7314578">
<caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" /> <caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-4.9079285">
<caret line="93" column="67" selection-start-line="93" selection-start-column="67" selection-end-line="93" selection-end-column="67" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1446,138 +1364,210 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.22954546"> <state vertical-scroll-proportion="0.1943734">
<caret line="36" column="11" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" /> <caret line="14" column="7" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.23863636"> <state vertical-scroll-proportion="1.5754476">
<caret line="9" column="90" selection-start-line="9" selection-start-column="90" selection-end-line="9" selection-end-column="90" /> <caret line="50" column="34" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
<folding /> <folding>
<element signature="imports" expanded="false" />
<element signature="e#2026#2027#0" expanded="false" />
<element signature="e#2117#2118#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33503836"> <state vertical-scroll-proportion="0.3318182">
<caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" /> <caret line="21" column="25" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.79539645"> <state vertical-scroll-proportion="0.03409091">
<caret line="40" column="51" selection-start-line="40" selection-start-column="51" selection-end-line="40" selection-end-column="51" /> <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.797954"> <state vertical-scroll-proportion="0.375">
<caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" /> <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/CustomMessages.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.1943734"> <state vertical-scroll-proportion="0.0">
<caret line="14" column="7" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" /> <caret line="50" column="100" selection-start-line="50" selection-start-column="100" selection-end-line="50" selection-end-column="100" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.5754476"> <state vertical-scroll-proportion="0.11160714">
<caret line="50" column="34" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" /> <caret line="5" column="53" selection-start-line="5" selection-start-column="53" selection-end-line="5" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.15625">
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="method#SendDocument#0;class#SenderHelper#0" expanded="false" />
<element signature="e#2026#2027#0" expanded="true" />
<element signature="e#2117#2118#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3318182"> <state vertical-scroll-proportion="0.15625">
<caret line="21" column="25" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="0" /> <caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java"> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/Queue.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.22727273"> <state vertical-scroll-proportion="0.41964287">
<caret line="146" column="41" selection-start-line="146" selection-start-column="41" selection-end-line="146" selection-end-column="41" /> <caret line="198" column="6" selection-start-line="198" selection-start-column="6" selection-end-line="198" selection-end-column="6" />
<folding> <folding />
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java"> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/concurrent/ConcurrentLinkedQueue.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.03409091"> <state vertical-scroll-proportion="-0.29166666">
<caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="22" /> <caret line="355" column="13" selection-start-line="355" selection-start-column="13" selection-end-line="355" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.375"> <state vertical-scroll-proportion="0.58035713">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" /> <caret line="208" column="32" selection-start-line="208" selection-start-column="32" selection-end-line="208" selection-end-column="32" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="docComment;method#fetchWeatherForecast#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#fetchWeatherForecastByLocation#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#fetchWeatherCurrent#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#fetchWeatherCurrentByLocation#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#convertListOfForecastToString#0;class#WeatherService#0" expanded="false" />
<element signature="method#convertListOfForecastToString#0;class#WeatherService#0" expanded="false" />
<element signature="docComment;method#convertInternalInformationToString#0;class#WeatherService#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.24107143">
<caret line="5" column="53" selection-start-line="5" selection-start-column="53" selection-end-line="5" selection-end-column="53" /> <caret line="339" column="9" selection-start-line="339" selection-start-column="9" selection-end-line="339" selection-end-column="9" />
<folding>
<element signature="docComment;class#TransifexService#0" expanded="false" />
<element signature="docComment;method#TransifexService#0;class#TransifexService#0" expanded="false" />
<element signature="method#TransifexService#0;class#TransifexService#0" expanded="false" />
<element signature="docComment;method#getInstance#0;class#TransifexService#0" expanded="false" />
<element signature="method#getInstance#0;class#TransifexService#0" expanded="false" />
<element signature="method#getFileAndroid#0;class#TransifexService#0" expanded="false" />
<element signature="method#getFileiOS#0;class#TransifexService#0" expanded="false" />
<element signature="method#getFileOSX#0;class#TransifexService#0" expanded="false" />
<element signature="method#getFileTDesktop#0;class#TransifexService#0" expanded="false" />
<element signature="method#getFileTemplate#0;class#TransifexService#0" expanded="false" />
<element signature="method#getFileWebogram#0;class#TransifexService#0" expanded="false" />
<element signature="method#getFileWP#0;class#TransifexService#0" expanded="false" />
<element signature="docComment;method#fixCaseCompositedLanguages#0;class#TransifexService#0" expanded="false" />
<element signature="method#fixCaseCompositedLanguages#0;class#TransifexService#0" expanded="false" />
<element signature="docComment;method#getAndroidSupportLanguageFile#0;class#TransifexService#0" expanded="false" />
<element signature="method#getAndroidSupportLanguageFile#0;class#TransifexService#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.5580357">
<caret line="93" column="26" selection-start-line="93" selection-start-column="26" selection-end-line="93" selection-end-column="26" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.12895928">
<caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" /> <caret line="90" column="0" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/CustomMessages.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.30542988">
<caret line="50" column="100" selection-start-line="50" selection-start-column="100" selection-end-line="50" selection-end-column="100" /> <caret line="54" column="5" selection-start-line="54" selection-start-column="5" selection-end-line="54" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.57918555">
<caret line="41" column="4" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.8068181"> <state vertical-scroll-proportion="0.23755656">
<caret line="117" column="12" selection-start-line="117" selection-start-column="12" selection-end-line="117" selection-end-column="12" /> <caret line="47" column="5" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.44117647">
<caret line="44" column="5" selection-start-line="44" selection-start-column="5" selection-end-line="44" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.4939759">
<caret line="301" column="46" selection-start-line="301" selection-start-column="46" selection-end-line="301" selection-end-column="46" />
<folding> <folding>
<element signature="method#SendDocument#0;class#SenderHelper#0" expanded="false" /> <element signature="e#10536#10537#0" expanded="true" />
<element signature="e#10601#10602#0" expanded="true" />
<element signature="e#10649#10650#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.40723982">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

14
src/main/java/org/telegram/api/Message.java
View File

@ -71,7 +71,7 @@ public class Message {
private String newChatTitle; ///< Optional. A group title was changed to this value private String newChatTitle; ///< Optional. A group title was changed to this value
public static final String NEWCHATPHOTO_FIELD = "new_chat_photo"; public static final String NEWCHATPHOTO_FIELD = "new_chat_photo";
@JsonProperty(NEWCHATPHOTO_FIELD) @JsonProperty(NEWCHATPHOTO_FIELD)
private String newChatPhoto; ///< Optional. A group photo was change to this value private List<PhotoSize> newChatPhoto; ///< Optional. A group photo was change to this value
public static final String DELETECHATPHOTO_FIELD = "delete_chat_photo"; public static final String DELETECHATPHOTO_FIELD = "delete_chat_photo";
@JsonProperty(DELETECHATPHOTO_FIELD) @JsonProperty(DELETECHATPHOTO_FIELD)
private Boolean deleteChatPhoto; ///< Optional. Informs that the group photo was deleted private Boolean deleteChatPhoto; ///< Optional. Informs that the group photo was deleted
@ -136,7 +136,13 @@ public class Message {
this.replyToMessage = new Message(jsonObject.getJSONObject(REPLYTOMESSAGE_FIELD)); this.replyToMessage = new Message(jsonObject.getJSONObject(REPLYTOMESSAGE_FIELD));
} }
this.newChatTitle = jsonObject.optString(NEWCHATTITLE_FIELD, ""); this.newChatTitle = jsonObject.optString(NEWCHATTITLE_FIELD, "");
this.newChatPhoto = jsonObject.optString(NEWCHATPHOTO_FIELD, ""); if (jsonObject.has(NEWCHATPHOTO_FIELD)) {
JSONArray photoArray = jsonObject.getJSONArray(NEWCHATPHOTO_FIELD);
this.newChatPhoto = new ArrayList<>();
for (int i = 0; i < photoArray.length(); i++) {
this.newChatPhoto.add(new PhotoSize(photoArray.getJSONObject(i)));
}
}
this.deleteChatPhoto = jsonObject.optBoolean(DELETECHATPHOTO_FIELD, false); this.deleteChatPhoto = jsonObject.optBoolean(DELETECHATPHOTO_FIELD, false);
this.groupchatCreated = jsonObject.optBoolean(GROUPCHATCREATED_FIELD, false); this.groupchatCreated = jsonObject.optBoolean(GROUPCHATCREATED_FIELD, false);
} }
@ -293,11 +299,11 @@ public class Message {
this.newChatTitle = newChatTitle; this.newChatTitle = newChatTitle;
} }
public String getNewChatPhoto() { public List<PhotoSize> getNewChatPhoto() {
return newChatPhoto; return newChatPhoto;
} }
public void setNewChatPhoto(String newChatPhoto) { public void setNewChatPhoto(List<PhotoSize> newChatPhoto) {
this.newChatPhoto = newChatPhoto; this.newChatPhoto = newChatPhoto;
} }

4
src/main/java/org/telegram/services/DirectionsService.java
View File

@ -91,7 +91,7 @@ public class DirectionsService {
} else { } else {
responseToUser = "Directions not found between " + origin + " and " + destination; responseToUser = "Directions not found between " + origin + " and " + destination;
} }
} catch (IOException e) { } catch (Exception e) {
responseToUser = "Error fetching weather info"; responseToUser = "Error fetching weather info";
} }
return responseToUser; return responseToUser;
@ -101,7 +101,7 @@ public class DirectionsService {
return URLEncoder.encode(address, "UTF-8"); return URLEncoder.encode(address, "UTF-8");
} }
public String getDirectionsSteps(JSONArray steps) { private String getDirectionsSteps(JSONArray steps) {
String stepsStringify = ""; String stepsStringify = "";
for (int i = 0; i < steps.length(); i++) { for (int i = 0; i < steps.length(); i++) {
stepsStringify += i + ".\t" + getDirectionForStep(steps.getJSONObject(i)) + "\n\n"; stepsStringify += i + ".\t" + getDirectionForStep(steps.getJSONObject(i)) + "\n\n";

225
src/main/java/org/telegram/services/TransifexService.java
View File

@ -177,24 +177,26 @@ public class TransifexService {
* @param language Language requested * @param language Language requested
*/ */
public SendDocument getAndroidSupportLanguageFile(String language) { public SendDocument getAndroidSupportLanguageFile(String language) {
String file = getFileAndroid(language); SendDocument sendDocument = null;
SendDocument sendDocument; try {
if (file != null && file.getBytes().length / BYTES1024 >= 10) { String file = getFileAndroid(language);
file = file.replaceAll("\"LanguageName\"\\>(\\w*)\\<\\/string\\>", "\"LanguageName\"\\>$1_1\\<\\/string\\>").replaceAll("\"LanguageCode\"\\>(\\w*)\\<\\/string\\>", "\"LanguageCode\"\\>$1_1\\<\\/string\\>");
try { if (file != null && file.getBytes().length / BYTES1024 >= 10) {
String fileName = "languages_Android_" + language + ".xml"; file = file.replaceAll("\"LanguageName\"\\>(\\w*)\\<\\/string\\>", "\"LanguageName\"\\>$1_1\\<\\/string\\>").replaceAll("\"LanguageCode\"\\>(\\w*)\\<\\/string\\>", "\"LanguageCode\"\\>$1_1\\<\\/string\\>");
PrintWriter localFile = new PrintWriter(fileName); try {
localFile.print(file); String fileName = "languages_Android_" + language + ".xml";
localFile.close(); PrintWriter localFile = new PrintWriter(fileName);
File fileToUpload = new File(fileName); localFile.print(file);
sendDocument = new SendDocument(); localFile.close();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); File fileToUpload = new File(fileName);
} catch (FileNotFoundException e) { sendDocument = new SendDocument();
e.printStackTrace(); sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
sendDocument = null; } catch (FileNotFoundException e) {
e.printStackTrace();
}
} }
} else { } catch (Exception e) {
sendDocument = null; e.printStackTrace();
} }
return sendDocument; return sendDocument;
} }
@ -204,23 +206,24 @@ public class TransifexService {
* @param language Language requested * @param language Language requested
*/ */
public SendDocument getAndroidLanguageFile(String language) { public SendDocument getAndroidLanguageFile(String language) {
String file = getFileAndroid(language); SendDocument sendDocument = null;
SendDocument sendDocument; try {
if (file != null && file.getBytes().length / BYTES1024 >= 10) { String file = getFileAndroid(language);
try { if (file != null && file.getBytes().length / BYTES1024 >= 10) {
String fileName = "languages_Android_" + language + ".xml"; try {
PrintWriter localFile = new PrintWriter(fileName); String fileName = "languages_Android_" + language + ".xml";
localFile.print(file); PrintWriter localFile = new PrintWriter(fileName);
localFile.close(); localFile.print(file);
File fileToUpload = new File(fileName); localFile.close();
sendDocument = new SendDocument(); File fileToUpload = new File(fileName);
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); sendDocument = new SendDocument();
} catch (FileNotFoundException e) { sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
e.printStackTrace(); } catch (FileNotFoundException e) {
sendDocument = null; e.printStackTrace();
}
} }
} else { } catch (Exception e) {
sendDocument = null; e.printStackTrace();
} }
return sendDocument; return sendDocument;
} }
@ -231,23 +234,24 @@ public class TransifexService {
* @param language Language requested * @param language Language requested
*/ */
public SendDocument getiOSLanguageFile(String language) { public SendDocument getiOSLanguageFile(String language) {
byte[] file = getFileiOS(language); SendDocument sendDocument = null;
SendDocument sendDocument; try {
if (file != null && file.length / BYTES1024 >= 10) { byte[] file = getFileiOS(language);
try { if (file != null && file.length / BYTES1024 >= 10) {
String fileName = "languages_ios_" + language + ".strings"; try {
File fileToUpload = new File(fileName); String fileName = "languages_ios_" + language + ".strings";
FileOutputStream output = new FileOutputStream(fileToUpload); File fileToUpload = new File(fileName);
IOUtils.write(file, output); FileOutputStream output = new FileOutputStream(fileToUpload);
output.close(); IOUtils.write(file, output);
sendDocument = new SendDocument(); output.close();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); sendDocument = new SendDocument();
} catch (IOException e) { sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
e.printStackTrace(); } catch (IOException e) {
sendDocument = null; e.printStackTrace();
}
} }
} else { } catch (Exception e) {
sendDocument = null; e.printStackTrace();
} }
return sendDocument; return sendDocument;
} }
@ -257,23 +261,24 @@ public class TransifexService {
* @param language Language requested * @param language Language requested
*/ */
public SendDocument getOSXLanguageFile(String language) { public SendDocument getOSXLanguageFile(String language) {
byte[] file = getFileOSX(language); SendDocument sendDocument = null;
SendDocument sendDocument; try {
if (file != null && file.length / BYTES1024 >= 10) { byte[] file = getFileOSX(language);
try { if (file != null && file.length / BYTES1024 >= 10) {
String fileName = "languages_osx_" + language + ".strings"; try {
File fileToUpload = new File(fileName); String fileName = "languages_osx_" + language + ".strings";
FileOutputStream output = new FileOutputStream(fileToUpload); File fileToUpload = new File(fileName);
IOUtils.write(file, output); FileOutputStream output = new FileOutputStream(fileToUpload);
output.close(); IOUtils.write(file, output);
sendDocument = new SendDocument(); output.close();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); sendDocument = new SendDocument();
} catch (IOException e) { sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
e.printStackTrace(); } catch (IOException e) {
sendDocument = null; e.printStackTrace();
}
} }
} else { } catch (Exception e) {
sendDocument = null; e.printStackTrace();
} }
return sendDocument; return sendDocument;
} }
@ -283,22 +288,26 @@ public class TransifexService {
* @param language Language requested * @param language Language requested
*/ */
public SendDocument getTdesktopLanguageFile(String language) { public SendDocument getTdesktopLanguageFile(String language) {
byte[] file = getFileTDesktop(language);
SendDocument sendDocument = null; SendDocument sendDocument = null;
if (file != null && file.length / BYTES1024 >= 10) { try {
try { byte[] file = getFileTDesktop(language);
String fileName = "languages_tdesktop_" + language + ".strings"; if (file != null && file.length / BYTES1024 >= 10) {
File fileToUpload = new File(fileName); try {
FileOutputStream output = new FileOutputStream(fileToUpload); String fileName = "languages_tdesktop_" + language + ".strings";
IOUtils.write(file, output); File fileToUpload = new File(fileName);
output.close(); FileOutputStream output = new FileOutputStream(fileToUpload);
if (fileToUpload.exists()) { IOUtils.write(file, output);
sendDocument = new SendDocument(); output.close();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); if (fileToUpload.exists()) {
sendDocument = new SendDocument();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
}
} catch (IOException e) {
e.printStackTrace();
} }
} catch (IOException e) {
e.printStackTrace();
} }
} catch (Exception e) {
e.printStackTrace();
} }
return sendDocument; return sendDocument;
} }
@ -308,22 +317,26 @@ public class TransifexService {
* @param language Language requested * @param language Language requested
*/ */
public SendDocument getWebogramLanguageFile(String language) { public SendDocument getWebogramLanguageFile(String language) {
byte[] file = getFileWebogram(language);
SendDocument sendDocument = null; SendDocument sendDocument = null;
if (file != null && file.length / BYTES1024 >= 10) { try {
try { byte[] file = getFileWebogram(language);
String fileName = "languages_webogram_" + language + ".json"; if (file != null && file.length / BYTES1024 >= 10) {
File fileToUpload = new File(fileName); try {
FileOutputStream output = new FileOutputStream(fileToUpload); String fileName = "languages_webogram_" + language + ".json";
IOUtils.write(file, output); File fileToUpload = new File(fileName);
output.close(); FileOutputStream output = new FileOutputStream(fileToUpload);
if (fileToUpload.exists()) { IOUtils.write(file, output);
sendDocument = new SendDocument(); output.close();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); if (fileToUpload.exists()) {
sendDocument = new SendDocument();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
}
} catch (IOException e) {
e.printStackTrace();
} }
} catch (IOException e) {
e.printStackTrace();
} }
} catch (Exception e) {
e.printStackTrace();
} }
return sendDocument; return sendDocument;
} }
@ -333,22 +346,26 @@ public class TransifexService {
* @param language Language requested * @param language Language requested
*/ */
public SendDocument getWPLanguageFile(String language) { public SendDocument getWPLanguageFile(String language) {
byte[] file = getFileWP(language);
SendDocument sendDocument = null; SendDocument sendDocument = null;
if (file != null && file.length / BYTES1024 >= 10) { try {
try { byte[] file = getFileWP(language);
String fileName = "languages_wp_" + language + ".xml"; if (file != null && file.length / BYTES1024 >= 10) {
File fileToUpload = new File(fileName); try {
FileOutputStream output = new FileOutputStream(fileToUpload); String fileName = "languages_wp_" + language + ".xml";
IOUtils.write(file, output); File fileToUpload = new File(fileName);
output.close(); FileOutputStream output = new FileOutputStream(fileToUpload);
if (fileToUpload.exists()) { IOUtils.write(file, output);
sendDocument = new SendDocument(); output.close();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); if (fileToUpload.exists()) {
sendDocument = new SendDocument();
sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
}
} catch (IOException e) {
e.printStackTrace();
} }
} catch (IOException e) {
e.printStackTrace();
} }
} catch (Exception e) {
e.printStackTrace();
} }
return sendDocument; return sendDocument;
} }

8
src/main/java/org/telegram/services/WeatherService.java
View File

@ -95,7 +95,7 @@ public class WeatherService {
} else { } else {
responseToUser = "City not found"; responseToUser = "City not found";
} }
} catch (IOException e) { } catch (Exception e) {
responseToUser = "Error fetching weather info"; responseToUser = "Error fetching weather info";
} }
return responseToUser; return responseToUser;
@ -134,7 +134,7 @@ public class WeatherService {
} else { } else {
responseToUser = "City not found"; responseToUser = "City not found";
} }
} catch (IOException e) { } catch (Exception e) {
responseToUser = "Error fetching weather info"; responseToUser = "Error fetching weather info";
} }
return responseToUser; return responseToUser;
@ -174,7 +174,7 @@ public class WeatherService {
} else { } else {
responseToUser = "City not found"; responseToUser = "City not found";
} }
} catch (IOException e) { } catch (Exception e) {
responseToUser = "Error fetching weather info"; responseToUser = "Error fetching weather info";
} }
return responseToUser; return responseToUser;
@ -213,7 +213,7 @@ public class WeatherService {
} else { } else {
responseToUser = "City not found"; responseToUser = "City not found";
} }
} catch (IOException e) { } catch (Exception e) {
responseToUser = "Error fetching weather info"; responseToUser = "Error fetching weather info";
} }
return responseToUser; return responseToUser;

7
src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
View File

@ -44,13 +44,6 @@ public class DirectionsHandlers implements UpdatesCallback {
handleDirections(update); handleDirections(update);
} }
@Override
public void onUpdatesReceived(List<Update> updates) {
for (Update update: updates) {
handleDirections(update);
}
}
public void handleDirections(Update update) { public void handleDirections(Update update) {
Message message = update.getMessage(); Message message = update.getMessage();
if (message != null && message.hasText()) { if (message != null && message.hasText()) {

7
src/main/java/org/telegram/updateshandlers/FilesHandlers.java
View File

@ -47,13 +47,6 @@ public class FilesHandlers implements UpdatesCallback {
handleFileUpdate(update); handleFileUpdate(update);
} }
@Override
public void onUpdatesReceived(List<Update> updates) {
for (Update update: updates) {
handleFileUpdate(update);
}
}
public void handleFileUpdate(Update update) { public void handleFileUpdate(Update update) {
Message message = update.getMessage(); Message message = update.getMessage();
if (message != null && message.hasText()) { if (message != null && message.hasText()) {

7
src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
View File

@ -40,13 +40,6 @@ public class TransifexHandlers implements UpdatesCallback {
sendTransifexFile(update); sendTransifexFile(update);
} }
@Override
public void onUpdatesReceived(List<Update> updates) {
for (Update update: updates) {
sendTransifexFile(update);
}
}
public void sendTransifexFile(Update update) { public void sendTransifexFile(Update update) {
Message message = update.getMessage(); Message message = update.getMessage();
if (message != null && message.hasText()) { if (message != null && message.hasText()) {

1
src/main/java/org/telegram/updateshandlers/UpdatesCallback.java
View File

@ -12,5 +12,4 @@ import java.util.List;
*/ */
public interface UpdatesCallback { public interface UpdatesCallback {
void onUpdateReceived(Update update); void onUpdateReceived(Update update);
void onUpdatesReceived(List<Update> updates);
} }

7
src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
View File

@ -54,13 +54,6 @@ public class WeatherHandlers implements UpdatesCallback {
sendWeatherInformation(update); sendWeatherInformation(update);
} }
@Override
public void onUpdatesReceived(List<Update> updates) {
for (Update update: updates) {
sendWeatherInformation(update);
}
}
public void sendWeatherInformation(Update update) { public void sendWeatherInformation(Update update) {
Message message = update.getMessage(); Message message = update.getMessage();
if (message != null && message.hasText()) { if (message != null && message.hasText()) {

44
src/main/java/org/telegram/updatesreceivers/UpdatesThread.java
View File

@ -21,6 +21,9 @@ import java.io.IOException;
import java.io.InvalidObjectException; import java.io.InvalidObjectException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ConcurrentLinkedQueue;
/** /**
* @author Ruben Bermudez * @author Ruben Bermudez
@ -31,19 +34,19 @@ import java.util.List;
public class UpdatesThread { public class UpdatesThread {
private final UpdatesCallback callback; private final UpdatesCallback callback;
private final ReaderThread readerThread; private final ReaderThread readerThread;
private final HandlerThread handlerThread;
private int lastReceivedUpdate; private int lastReceivedUpdate;
private String token; private String token;
private final ConcurrentLinkedQueue<Update> receivedUpdates = new ConcurrentLinkedQueue<>();
public UpdatesThread(String token, UpdatesCallback callback) { public UpdatesThread(String token, UpdatesCallback callback) {
this.token = token; this.token = token;
this.callback = callback; this.callback = callback;
this.lastReceivedUpdate = -1; this.lastReceivedUpdate = -1;
if (BuildVars.useWebHook) { this.readerThread = new ReaderThread();
this.readerThread = null; this.readerThread.start();
} else { this.handlerThread = new HandlerThread();
this.readerThread = new ReaderThread(); this.handlerThread.start();
this.readerThread.start();
}
} }
private class ReaderThread extends Thread { private class ReaderThread extends Thread {
@ -81,7 +84,10 @@ public class UpdatesThread {
updates.add(update); updates.add(update);
} }
callback.onUpdatesReceived(updates); receivedUpdates.addAll(updates);
synchronized (receivedUpdates) {
receivedUpdates.notifyAll();
}
} else { } else {
try { try {
synchronized (this) { synchronized (this) {
@ -108,4 +114,28 @@ public class UpdatesThread {
} }
} }
} }
private class HandlerThread extends Thread {
@Override
public void run() {
while(true) {
Update update = receivedUpdates.poll();
if (update == null) {
synchronized (receivedUpdates) {
try {
receivedUpdates.wait();
} catch (InterruptedException e) {
continue;
}
update = receivedUpdates.poll();
if (update == null) {
continue;
}
}
}
callback.onUpdateReceived(update);
}
}
}
} }

Write Preview
Loading…
Cancel
Save