@@ -47,9 +47,6 @@ this.App =

     startPollingMessages: ->

       App.Com.trigger(event: 'app.chat.startPollingMessages')

-    whoUseThisApp: ->

-      App.Com.trigger(event: 'app.roster.whoUseThisApp')

-

     setPresence: ->

       App.Com.trigger(event: 'app.roster.setPresence')

@@ -14,7 +14,6 @@ App.Com.connect( (connected_jid) ->

   App.Com.initRoster(->

     App.Com.startFetchingVcards()

     App.Com.startPollingRoster()

-    App.Com.whoUseThisApp()

     App.Com.setPresence()

     App.Com.getMe()

@@ -97,6 +97,11 @@ class WsRosterController < WsController

     # Zacni pocuvat zmeny stavov v rosteri

     def start_polling_contacts_state

         connection_store[:rosters].each do |roster|

+            start_polling_control_answer()

+            #start_polling_subscription(roster)

+            #start_polling_presence(roster)

+

+            #subscription

             roster.add_subscription_callback do |roster_item, stanza|

                 # stan unsubscribe = niekto uz ma nesubscribuje

                 # stan unsubscribed = niekto ma uz nesubscribuje a aj si ma vymazal

@@ -110,12 +115,13 @@ class WsRosterController < WsController

                              belongsTo: client.jid.strip.to_s

             end

+            #presence

             roster.add_presence_callback do |roster_item, old_presence, new_presence|

                 if new_presence.type == :unavailable

                     result = {message: ''}

                     unless connection_store[:presences][roster_item.jid.strip.to_s].nil?

-                        connection_store[:presences][roster_item.jid.strip.to_s].delete(new_presence.from.to_s)

+                        connection_store[:presences][roster_item.jid.strip.to_s.to_sym].delete(new_presence.from.to_s)

                     end

                     # mozno treba vyhodit cloveka z multichatu, ak som jeho owner

@@ -124,14 +130,16 @@ class WsRosterController < WsController

                     status = uniform_presence(new_presence.show)

                     result = {message: new_presence.status.to_s}

-                    if connection_store[:presences][roster_item.jid.strip.to_s].nil?

-                        connection_store[:presences][roster_item.jid.strip.to_s] = Hash.new()

+                    if connection_store[:presences][roster_item.jid.strip.to_s.to_sym].nil?

+                        connection_store[:presences][roster_item.jid.strip.to_s.to_sym] = Hash.new()

                     end

-                    connection_store[:presences][roster_item.jid.strip.to_s][new_presence.from.to_s] = {

+                    connection_store[:presences][roster_item.jid.strip.to_s][new_presence.from.to_s.to_sym] = {

                         status: status,

                         multichat: false

                     }

+

+                    ask_if_using_this_app(connection_store[:link_roster_client][roster], new_presence.from.strip.to_s)

                 end

                 result[:status] = select_most_online_status(roster_item.jid.strip.to_s)

@@ -228,18 +236,6 @@ class WsRosterController < WsController

         end

     end

-    def ask_if_using_this_app

-        connection_store[:rosters].each do |roster|

-            client = connection_store[:link_roster_client][roster]

-

-            roster.items.each do |jid, contact|

-                client.send(MessageBuilder::control_question(client.jid.strip.to_s, jid))

-            end

-        end

-

-        start_polling_control_answer()

-    end

-

     ##

     # Pridaj noveho priatela do zoznamu

     def add_friend(data)

@@ -285,12 +281,22 @@ class WsRosterController < WsController

         connection_store[:clients].each do |client|

             client.add_message_callback do |message|

                 if message.attribute('i_am_using_same_app')

+                    connection_store[:presences][message.from.strip.to_s][message.from.to_s.to_sym][multichat: true]

+

                     send_message 'app.roster.using_this_app',

-                                 jid: message.from.node + '@' + message.from.domain

+                                 jid: message.from.strip.to_s

                 elsif message.attribute('are_you_using_my_app')

-                    client.send(MessageBuilder::control_answer(client.jid.strip.to_s, message.from))

+                    client.send(MessageBuilder::control_answer(client.jid.to_s, message.from.to_s))

                 end

             end

         end

     end

+

+    def ask_if_using_this_app(client, contact)

+        return unless connection_store[:presences][contact]

+

+        connection_store[:presences][contact].each do |jid_resource, state|

+            client.send(MessageBuilder::control_question(client.jid.to_s, jid_resource.to_s))

+        end

+    end

 end

@@ -57,7 +57,6 @@ WebsocketRails::EventMap.describe do

             subscribe :updateMyStatus,      to: WsRosterController, with_method: :me_update_status

             subscribe :updateMyVcard,       to: WsRosterController, with_method: :me_update_vcard

             subscribe :removeContact,       to: WsRosterController, with_method: :remove_contact

-            subscribe :whoUseThisApp,       to: WsRosterController, with_method: :ask_if_using_this_app

         end

         namespace :chat do