commit 0f66bd33a338dda038dfdfe8f7f91a5afb4e9a7d
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Jan 18 11:30:45 2016 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Jan 19 14:27:59 2016 -0500
tree 260865db6dc8d3a6ce50c16d331ec67f91bce05a
parent 572277779fed7d5c84481b40a21993f7adecc993

chat: add conversation screen

- ability to chat off call
- system notification on incoming msg
- notification in smartlist

Tuleap: #202
Change-Id: Ide10f80f677f23022ad4296a82ae122e69a892cc

src/AppDelegate.mm

diff --git a/src/AppDelegate.mm b/src/AppDelegate.mm
index 96f5294..77d58e5 100644
--- a/src/AppDelegate.mm
+++ b/src/AppDelegate.mm
@@ -22,6 +22,8 @@
 #import <qapplication.h>
 #import <accountmodel.h>
 #import <protocolmodel.h>
+#import <media/recordingmodel.h>
+#import <media/textrecording.h>
 #import <QItemSelectionModel>
 #import <account.h>
 
@@ -79,13 +81,42 @@
                              [self showIncomingNotification:call];
                          }
                      });
+
+
+
+    QObject::connect(&Media::RecordingModel::instance(),
+                     &Media::RecordingModel::newTextMessage,
+                     [=](Media::TextRecording* t, ContactMethod* cm) {
+
+                         BOOL shouldNotify = [[NSUserDefaults standardUserDefaults] boolForKey:Preferences::Notifications];
+                         auto qIdx = t->instantTextMessagingModel()->index(t->instantTextMessagingModel()->rowCount()-1, 0);
+
+                         // Don't show a notification if we are sending the text OR window already has focus OR user disabled notifications
+                         if(qvariant_cast<Media::Media::Direction>(qIdx.data((int)Media::TextRecording::Role::Direction)) == Media::Media::Direction::OUT
+                            || self.ringWindowController.window.keyWindow || !shouldNotify)
+                             return;
+
+                         NSUserNotification* notification = [[NSUserNotification alloc] init];
+
+                         NSString* localizedTitle = NSLocalizedString(([NSString stringWithFormat:@"Message from %@",
+                                                                        qIdx.data((int)Media::TextRecording::Role::AuthorDisplayname).toString().toNSString()]),
+                                                                      @"Text message notification title");
+
+                         [notification setTitle:localizedTitle];
+                         [notification setSoundName:NSUserNotificationDefaultSoundName];
+                         [notification setSubtitle:qIdx.data().toString().toNSString()];
+
+                         [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+                     });
 }
 
 - (void) showIncomingNotification:(Call*) call{
     NSUserNotification *notification = [[NSUserNotification alloc] init];
-    notification.title = @"Incoming call", call->peerName();
-    //notification.informativeText = @"A notification";
-    notification.soundName = NSUserNotificationDefaultSoundName;
+    NSString* localizedTitle = NSLocalizedString(([NSString stringWithFormat:@"Incoming call from %@",
+                                                   call->peerName().toNSString()]),
+                                                 @"Call notification title");
+    [notification setTitle:localizedTitle];
+    [notification setSoundName:NSUserNotificationDefaultSoundName];
 
     [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
 }
@@ -99,7 +130,6 @@
 
 - (void) showWizard
 {
-    NSLog(@"Showing wizard");
     if(self.wizard == nil) {
         self.wizard = [[RingWizardWC alloc] initWithWindowNibName:@"RingWizard"];
     }