2 files changed, 33 insertions, 4 deletions
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index 796146f8..e80a65d0 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -12,7 +12,7 @@ public class Dino.Ui.Application : Adw.Application, Dino.Application {
     private const string[] KEY_COMBINATION_LOOP_CONVERSATIONS_REV = {"<Ctrl><Shift>Tab", null};
     private const string[] KEY_COMBINATION_SHOW_SETTINGS = {"<Ctrl>comma", null};
 
-    private MainWindow window;
+    public MainWindow window;
     public MainWindowController controller;
 
     public Database db { get; set; }
diff --git a/main/src/ui/conversation_content_view/subscription_notification.vala b/main/src/ui/conversation_content_view/subscription_notification.vala
index b825f4ad..7fdda0b3 100644
--- a/main/src/ui/conversation_content_view/subscription_notification.vala
+++ b/main/src/ui/conversation_content_view/subscription_notification.vala
@@ -18,7 +18,7 @@ public class SubscriptionNotitication : Object {
             Conversation relevant_conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(jid, account, Conversation.Type.CHAT);
             stream_interactor.get_module(ConversationManager.IDENTITY).start_conversation(relevant_conversation);
             if (conversation != null && account.equals(conversation.account) && jid.equals(conversation.counterpart)) {
-                show_notification();
+                show_pending_subscription_request();
             }
         });
     }
@@ -27,22 +27,51 @@ public class SubscriptionNotitication : Object {
         this.conversation = conversation;
         this.conversation_view = conversation_view;
 
+        if (conversation.type_ != Conversation.Type.CHAT) return;
+
         if (stream_interactor.get_module(PresenceManager.IDENTITY).exists_subscription_request(conversation.account, conversation.counterpart)) {
-            show_notification();
+            show_pending_subscription_request();
+        } else {
+            var roster_item = stream_interactor.get_module(RosterManager.IDENTITY).get_roster_item(conversation.account, conversation.counterpart);
+            if (roster_item == null ||
+                    (roster_item.subscription == Xmpp.Roster.Item.SUBSCRIPTION_NONE || roster_item.subscription == Xmpp.Roster.Item.SUBSCRIPTION_FROM) &&
+                    !roster_item.subscription_requested) {
+                show_no_subscription(roster_item != null);
+            }
         }
     }
 
-    private void show_notification() {
+    private void show_no_subscription(bool already_in_roster) {
+        Box box = new Box(Orientation.HORIZONTAL, 5);
+        Button accept_button = new Button.with_label(_("Send request"));
+        GLib.Application app = GLib.Application.get_default();
+        accept_button.clicked.connect(() => {
+            if (!already_in_roster) {
+                stream_interactor.get_module(RosterManager.IDENTITY).add_jid(conversation.account, conversation.counterpart, null);
+            }
+            stream_interactor.get_module(PresenceManager.IDENTITY).request_subscription(conversation.account, conversation.counterpart);
+            app.activate_action("accept-subscription", conversation.id);
+            ((Dino.Ui.Application) app).window.conversation_view.chat_input.chat_text_view.text_view.grab_focus();
+            conversation_view.remove_notification(box);
+        });
+        box.append(new Label(_("You do not receive status updates from this contact yet.")) { margin_end=10 });
+        box.append(accept_button);
+        conversation_view.add_notification(box);
+    }
+
+    private void show_pending_subscription_request() {
         Box box = new Box(Orientation.HORIZONTAL, 5);
         Button accept_button = new Button.with_label(_("Accept"));
         Button deny_button = new Button.with_label(_("Deny"));
         GLib.Application app = GLib.Application.get_default();
         accept_button.clicked.connect(() => {
             app.activate_action("accept-subscription", conversation.id);
+            ((Dino.Ui.Application) app).window.conversation_view.chat_input.chat_text_view.text_view.grab_focus();
             conversation_view.remove_notification(box);
         });
         deny_button.clicked.connect(() => {
             app.activate_action("deny-subscription", conversation.id);
+            ((Dino.Ui.Application) app).window.conversation_view.chat_input.chat_text_view.text_view.grab_focus();
             conversation_view.remove_notification(box);
         });
         box.append(new Label(_("This contact would like to add you to their contact list")) { margin_end=10 });