Added toaster for callback answers

Author: zhukov

app/index.html

@@ -11,6 +11,7 @@
   <!-- build:css css/app.css -->
   <link rel="stylesheet" href="vendor/angular/angular-csp.css"/>
   <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.css"/>
+  <link rel="stylesheet" href="vendor/angularjs-toaster/toaster.css"/>
   <link rel="stylesheet" href="css/app.css"/>
   <!-- endbuild -->
 
@@ -65,6 +66,7 @@
   <script type="text/javascript" src="vendor/closure/long.js"></script>
   <script type="text/javascript" src="vendor/leemon_bigint/bigint.js"></script>
   <script type="text/javascript" src="vendor/libwebpjs/libwebp-0.2.0.js"></script>
+  <script type="text/javascript" src="vendor/angularjs-toaster/toaster.js"></script>
 
 
   <script type="text/javascript" src="js/lib/utils.js"></script>

app/js/app.js

@@ -20,6 +20,7 @@ angular.module('myApp', [
   'ngTouch',
   'ui.bootstrap',
   'mediaPlayer',
+  'toaster',
   'izhukov.utils',
   'izhukov.mtproto',
   'izhukov.mtproto.wrapper',

app/js/controllers.js

@@ -1804,6 +1804,9 @@ angular.module('myApp.controllers', ['myApp.i18n'])
       if (!replyKeyboard) {
         return;
       }
+      var sendOptions = {
+        replyToMsgID: peerID < 0 && replyKeyboard.mid
+      };
       switch (button._) {
         case 'keyboardButtonRequestPhone':
           ErrorService.confirm({type: 'BOT_ACCESS_PHONE'}).then(function () {
@@ -1813,9 +1816,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
               phone_number: user.phone,
               first_name: user.first_name,
               last_name: user.last_name
-            }, {
-              replyToMsgID: peerID < 0 && replyKeyboard.mid
-            });
+            }, sendOptions);
           });
           break;
 
@@ -1829,22 +1830,18 @@ angular.module('myApp.controllers', ['myApp.i18n'])
                   'lat': coords['lat'],
                   'long': coords['long']
                 }
-              }, {
-                replyToMsgID: peerID < 0 && replyKeyboard.mid
-              });
+              }, sendOptions);
             }, function (error) {
               ErrorService.alert(
-                _('error_modal_password_success_title_raw'),
-                _('error_modal_password_success_descripion_raw')
+                _('error_modal_bad_request_title_raw'),
+                _('error_modal_gelocation_na_raw')
               );
             });
           });
           break;
 
         default:
-          AppMessagesManager.sendText(peerID, button.text, {
-            replyToMsgID: peerID < 0 && replyKeyboard.mid
-          });
+          AppMessagesManager.sendText(peerID, button.text, sendOptions);
       }
     });
 

app/js/locales/en-us.json

@@ -235,9 +235,9 @@
 	"confirm_modal_delete_group_md": "Are you sure you want to delete this group?\n\nAll members will be removed and all messages will be lost.",
 	"confirm_modal_jump_ext_url_md": "Open this link?\n\n{url}",
 	"confirm_modal_migrate_supergroup_md": "Please note that group members will need to update their Telegram apps to the latest version to see your supergroup.\n\nAre you sure you want to upgrade this group?",
-	"confirm_modal_bot_access_phone": "Do you want?",
-	"confirm_modal_bot_access_geo": "Do you want?",
-	"confirm_modal_bot_access_geo_inline": "Do you want?",
+	"confirm_modal_bot_access_phone": "The bot will know your phone number. This can be useful for integration with other services.",
+	"confirm_modal_bot_access_geo": "This will send your current location to the bot.",
+	"confirm_modal_bot_access_geo_inline": "This bot would like to know your location each time you send it a request. This can be used to provide location-specific results.",
 
 	"confirm_modal_are_u_sure": "Are you sure?",
 
@@ -392,6 +392,7 @@
 	"error_modal_invite_link_invalid": "The invite link is invalid",
 	"error_modal_channel_not_accessible": "Sorry, this channel is not accessible.",
 	"error_modal_not_contact_flood": "Sorry, you can only send messages to mutual contacts at the moment. {more-info-link: More info »}",
+	"error_modal_gelocation_na": "App was unable to determine your current location",
 
 
 	"head_telegram": "Telegram",

app/js/services.js

@@ -2383,7 +2383,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
   }
 })
 
-.service('AppInlineBotsManager', function (qSync, $q, $rootScope, Storage, ErrorService, MtpApiManager, AppMessagesManager, AppDocsManager, AppPhotosManager, RichTextProcessor, AppUsersManager, AppPeersManager, PeersSelectService, GeoLocationManager) {
+.service('AppInlineBotsManager', function (qSync, $q, $rootScope, toaster, Storage, ErrorService, MtpApiManager, AppMessagesManager, AppDocsManager, AppPhotosManager, RichTextProcessor, AppUsersManager, AppPeersManager, PeersSelectService, GeoLocationManager) {
 
   var inlineResults = {};
 
@@ -2460,7 +2460,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
             id: peerID,
             placeholder: bot.bot_inline_placeholder
           };
-          if (bot.pFlags.bot_inline_geo) {
+          if (bot.pFlags.bot_inline_geo &&
+              GeoLocationManager.isAvailable()) {
             return checkGeoLocationAccess(peerID).then(function () {
               return GeoLocationManager.getPosition().then(function (coords) {
                 resolvedBot.geo = coords;
@@ -2656,7 +2657,22 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
       msg_id: AppMessagesManager.getMessageLocalID(id),
       data: button.data
     }).then(function (callbackAnswer) {
-      console.info(callbackAnswer.message || 'empty answer');
+      if (typeof callbackAnswer.message != 'string' ||
+          !callbackAnswer.message.length) {
+        return;
+      }
+      if (callbackAnswer.pFlags.alert) {
+        ErrorService.alert(callbackAnswer.message);
+      } else {
+        var html = RichTextProcessor.wrapRichText(callbackAnswer.message, {noLinks: true, noLinebreaks: true}).valueOf();;
+        toaster.pop({
+          type: 'material',
+          timeout: 100000,
+          body: html,
+          bodyOutputType: 'trustedHtml',
+          showCloseButton: false
+        });
+      }
     });
   }
 

app/partials/desktop/im.html

@@ -247,3 +247,5 @@ <h3 class="im_dialogs_empty_header" my-i18n="im_get_started"></h3>
 </div>
 
 <div class="footer_wrap footer_empty"></div>
+
+<toaster-container toaster-options="{'position-class': 'toast-bottom-center'}"></toaster-container>

app/partials/mobile/im.html

@@ -192,4 +192,6 @@ <h5 my-i18n="im_messages"></h5>
 
   </div>
 
-</div>
+</div>
+
+<toaster-container></toaster-container>