Merge lp:~karni/telegram-app/telegram-app-add-push into lp:telegram-app/app

[Michał Karnicki]

Click package setup + QML setup for push.

getNotifications() is called in onWoken and onAuthLoggedIn to ensure we purge the pending notifications queue.

I suggest this API:

newNotifications.connect(telegramClient.onPushNotifications);
error.connect(telegramClient.onPushError);

Please log the QString in onPushError. You can (or not) log QStringList of onPushNotifications, but we'll probably need to disable it some time soon because of privacy.

[Roberto Mier Escandon (rmescandon)]

LGTM

review: Approve

[lp:~karni/telegram-app/telegram-app-add-push]

51. By Michał Karnicki on 2014-09-03

Call unregister when logged out.

[Roberto Mier Escandon (rmescandon)]

my fault, the methods are
accountRegisterDevice and accountUnregisterDevice. Sorry, I set it bad in comments

[lp:~karni/telegram-app/telegram-app-add-push]

52. By Michał Karnicki on 2014-09-03

account, not accounts.

53. By Michał Karnicki on 2014-09-03

Fix click packaging.

[Roberto Mier Escandon (rmescandon)]

LGTM

review: Approve

[lp:~karni/telegram-app/telegram-app-add-push]

54. By Michał Karnicki on 2014-09-03

Fix package name in click.sh

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-14 21:49:09 +0000
+++ CMakeLists.txt	2014-09-03 09:58:33 +0000
@@ -33,7 +33,7 @@
 )
 
 set(APP_NAME "telegram")
-set(APP_PACKAGE "com.canonical.${APP_NAME}")
+set(APP_PACKAGE "com.ubuntu.${APP_NAME}")
 set(APP_TITLE "Telegram")
 # Semantic versioning.
 set(APP_VERSION "${VERSION_TAG}.${VERSION_REV}")

=== added file 'apparmor-push.json'
--- apparmor-push.json	1970-01-01 00:00:00 +0000
+++ apparmor-push.json	2014-09-03 09:58:33 +0000
@@ -0,0 +1,6 @@
+{
+    "policy_groups": [
+        "push-notifications-client"
+    ],
+    "policy_version": 1.2
+}

=== renamed file 'apparmor.json' => 'apparmor-telegram.json'
--- apparmor.json	2014-07-15 23:03:19 +0000
+++ apparmor-telegram.json	2014-09-03 09:58:33 +0000
@@ -1,6 +1,7 @@
 {
     "policy_groups": [
-        "networking"
+        "networking",
+        "push-notifications-client"
     ],
     "policy_version": 1.2
-}
\ No newline at end of file
+}

=== modified file 'click.sh'
--- click.sh	2014-08-21 15:40:23 +0000
+++ click.sh	2014-09-03 09:58:33 +0000
@@ -19,7 +19,11 @@
 cp -a build/$ARCH/library/lib/libqtelegram.so* click/lib/$ARCH_TRIPLET
 cp -a build/$ARCH/library/qmlplugin/Telegram click/lib/$ARCH_TRIPLET
 
-cp apparmor.json click/
+cp apparmor-push.json click/
+cp push.json click/
+cp push.py click/
+
+cp apparmor-telegram.json click/
 cp telegram.qml click/
 cp telegram.pub click/
 

=== modified file 'manifest.json.in'
--- manifest.json.in	2014-08-23 00:15:59 +0000
+++ manifest.json.in	2014-09-03 09:58:33 +0000
@@ -6,18 +6,15 @@
     "architecture": "@ARCHITECTURE@",
     "title": "@APP_TITLE@",
     "hooks": {
-        "@APP_NAME@": {
-            "apparmor": "apparmor.json",
-            "desktop": "@APP_NAME@.desktop"
+        "telegram": {
+            "apparmor": "apparmor-telegram.json",
+            "desktop": "telegram.desktop"
+        },
+        "push": {
+            "apparmor": "apparmor-push.json",
+            "push-helper": "push.json"
         }
     },
     "icon": "@APP_ICON@",
     "maintainer": "https://launchpad.net/~libqtelegram-team",
-    "x-source": {
-        "vcs-bzr": "@BZR_SOURCE@",
-        "vcs-bzr-revno": "@BZR_REVNO@"
-    },
-    "x-test": {
-        "autopilot": "@AUTOPILOT_DIR@"
-    }
 }

=== added file 'push.json'
--- push.json	1970-01-01 00:00:00 +0000
+++ push.json	2014-09-03 09:58:33 +0000
@@ -0,0 +1,4 @@
+{
+    "exec": "push.py",
+    "app_id": "com.ubuntu.telegram_telegram"
+}

=== added file 'push.py'
--- push.py	1970-01-01 00:00:00 +0000
+++ push.py	2014-09-03 09:58:33 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/python3
+
+import sys
+
+f1, f2 = sys.argv[1:3]
+open(f2, "w").write(open(f1).read())
+

=== modified file 'telegram.qml'
--- telegram.qml	2014-09-02 14:30:36 +0000
+++ telegram.qml	2014-09-03 09:58:33 +0000
@@ -2,7 +2,9 @@
 import QtMultimedia 5.0
 import Qt.labs.settings 1.0
 import Ubuntu.Components 1.1
+import Ubuntu.PushNotifications 0.1
 import Telegram 0.1
+import "../js/version.js" as Version
 import "ui"
 
 MainView {
@@ -29,6 +31,7 @@
         if (initCalled) {
             if (activeFocus) {
                 console.log("Telegram resuming..");
+                pushClient.clearPersistent("chat");
                 telegramClient.wake();
             } else {
                 console.log("Telegram suspending..");
@@ -162,6 +165,17 @@
         property double notificationVolume: 0.7
     }
 
+    PushClient {
+        id: pushClient
+        appId: "com.ubuntu.telegram_telegram"
+        Component.onCompleted: {
+            newNotifications.connect(telegramClient.onPushNotifications);
+            error.connect(telegramClient.onPushError);
+
+            telegramClient.accountRegisterDevice(token, Version.version);
+        }
+    }
+
     TelegramClient {
         id: telegramClient
         configPath: "~/.config/" + applicationName
@@ -230,6 +244,7 @@
             }
             pageStack.clear();
             pageStack.push(dialogsPage);
+            telegramClient.getNotifications();
         }
 
         onAuthLogOutAnswer: {
@@ -237,12 +252,17 @@
             sessionSettings.phoneNumber = "";
             sessionSettings.isFirstLaunch = true;
 
+            telegramClient.accountUnregisterDevice(pushClient.token);
             pageStack.clear();
             // TODO This line will go away when sign in page is used as component.
             signInPage.enableForm();
             pageStack.push(signInPage);
         }
 
+        onWoken: {
+            telegramClient.getNotifications();
+        }
+
         onUpdateShortMessage: {
             //messageReceivedSound.play();
         }