Upgrade TypeScript from 2.1 to 2.6

package-lock.json

@@ -23,27 +23,24 @@
       }
     },
     "@types/angular": {
-      "version": "1.5.23",
-      "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.5.23.tgz",
-      "integrity": "sha1-zNF1VW40EGTajk1qDD5J9LmaIYI=",
-      "requires": {
-        "@types/jquery": "2.0.48"
-      }
+      "version": "1.6.43",
+      "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.43.tgz",
+      "integrity": "sha512-3GrHCRZS62ruJjHMtOx3WYsS0I8i0FRcIqOwqIfWXnlR9g2FebEhUNdMk3LZIvfhZ08xe+S1x2iwP1t9vKCHag=="
     },
     "@types/angular-material": {
-      "version": "1.1.53",
-      "resolved": "https://registry.npmjs.org/@types/angular-material/-/angular-material-1.1.53.tgz",
-      "integrity": "sha512-F/QL3zBbE+jn5i1U8Ru4sBjywc3e3UOWUdWGzuS0TQoTezEJqfp2spBk+RpuwKhh85r/4kSjnrs/JNIcv6jpLw==",
+      "version": "1.1.58",
+      "resolved": "https://registry.npmjs.org/@types/angular-material/-/angular-material-1.1.58.tgz",
+      "integrity": "sha512-s4X3FupDNIArE0TSX170gY0OLXXFYZCO+28/LcbAnL6FLuhYF83diESUM1yluQ2JrDbiVB5PnV3N3FID10hi/Q==",
       "requires": {
-        "@types/angular": "1.5.23"
+        "@types/angular": "1.6.43"
       }
     },
     "@types/angular-sanitize": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/angular-sanitize/-/angular-sanitize-1.3.5.tgz",
-      "integrity": "sha512-VOKj2NWYPHi70AZCpZu8tiHOM984I9rsFIY1M3adFSiUV4GmmT4VHKCmnVyUW22OFL8/Yet1FHWHw0j+QMxRKQ==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@types/angular-sanitize/-/angular-sanitize-1.3.7.tgz",
+      "integrity": "sha512-Ha8XJ2zP2jPwRd4cQ3f1fGhrdbgCbyHoHMdSoMjfx7Se5VtNTdxFuAlW59dXlDadIo9JTHimWbYVRQYiUMdjoQ==",
       "requires": {
-        "@types/angular": "1.5.23"
+        "@types/angular": "1.6.43"
       }
     },
     "@types/angular-translate": {
@@ -51,15 +48,15 @@
       "resolved": "https://registry.npmjs.org/@types/angular-translate/-/angular-translate-2.4.35.tgz",
       "integrity": "sha1-GaSDJIZknkktbI1N0F0vwfWDv58=",
       "requires": {
-        "@types/angular": "1.5.23"
+        "@types/angular": "1.6.43"
       }
     },
     "@types/angular-ui-router": {
-      "version": "1.1.37",
-      "resolved": "https://registry.npmjs.org/@types/angular-ui-router/-/angular-ui-router-1.1.37.tgz",
-      "integrity": "sha512-R1b+TZvKTY1M/oagihheJfzLETjCy2VGGicUGYJXFaTE0Z8/ZJQx8MVMNcAzu9ab6ZUR94m1QUiiHVthZZ/f9w==",
+      "version": "1.1.40",
+      "resolved": "https://registry.npmjs.org/@types/angular-ui-router/-/angular-ui-router-1.1.40.tgz",
+      "integrity": "sha512-4xMwNeSNrRHj2uaLAbeACVjgTCLCDHqwMQOKE0lq6MIXngVuvc0zucGKg2WYd4i+goxl9R3agH3w4qnEseIbxw==",
       "requires": {
-        "@types/angular": "1.5.23"
+        "@types/angular": "1.6.43"
       }
     },
     "@types/filesaver": {
@@ -73,22 +70,22 @@
       "integrity": "sha512-nNLzUrVjaRV/Ds1eHZLYTd7IZxs38cwwLSaqMJj8OTXY8xNUbxSK69bi9cMLvQ7dm/IBeQ1wHwQ0S1uYa0rd2w=="
     },
     "@types/msgpack-lite": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@types/msgpack-lite/-/msgpack-lite-0.1.4.tgz",
-      "integrity": "sha1-D/oSuwCPm4dl99Z3LBCbrziSXeU=",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@types/msgpack-lite/-/msgpack-lite-0.1.6.tgz",
+      "integrity": "sha512-Y9GFyM8qt5p7p+HtM9rsSAnle4ZmcpNAhbaFQyj1XzaHgEVCYgRNJiCeGxf5Jf81/a/G1o+LuGDE3mvLosU2MA==",
       "requires": {
-        "@types/node": "8.0.22"
+        "@types/node": "9.4.0"
       }
     },
     "@types/node": {
-      "version": "8.0.22",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.22.tgz",
-      "integrity": "sha512-+YQ5JLlvLP24teVUdUDep83mAWIFoAnOMosrH/2+xDeU9YMUpmMJtYOqVtbivs37h2PL9svz0R3r/MfVuEvEIA=="
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-9.4.0.tgz",
+      "integrity": "sha512-zkYho6/4wZyX6o9UQ8rd0ReEaiEYNNCqYFIAACe2Tf9DrYlgzWW27OigYHnnztnnZQwVRpwWmZKegFmDpinIsA=="
     },
     "@types/webrtc": {
-      "version": "0.0.21",
-      "resolved": "https://registry.npmjs.org/@types/webrtc/-/webrtc-0.0.21.tgz",
-      "integrity": "sha1-vDz7fiKt0oR2Hl1j761mSw66i4Y="
+      "version": "0.0.23",
+      "resolved": "https://registry.npmjs.org/@types/webrtc/-/webrtc-0.0.23.tgz",
+      "integrity": "sha512-mq3RpNvVoR2r5ts7gGJh+uHv2wgLUdu1r+rwsZoR5tmb9pCtj8uMC1BWpYQF/SZBtPaj9RfnbIvudk+ajdXP4w=="
     },
     "JSONStream": {
       "version": "1.3.1",
@@ -151,9 +148,9 @@
       "integrity": "sha1-7RLzlLpxqRidZkEVYk9nh6dDmvI="
     },
     "angular-messages": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.6.5.tgz",
-      "integrity": "sha1-zIEnxI38R+af7dCw6t1al9GJg6g="
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.6.9.tgz",
+      "integrity": "sha512-/2xvG6vDC+Us8h0baSa1siDKwPj5R2A7LldxxhK2339HInc09bq9shMVCUy9zqnuvwnDUJ/DSgkSaBoSHSZrqg=="
     },
     "angular-mocks": {
       "version": "1.5.11",
@@ -4495,9 +4492,9 @@
       "dev": true
     },
     "karma-jasmine": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.0.tgz",
-      "integrity": "sha1-IuTAa/mhguUpTR9wXjczgRuBCs8=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.1.tgz",
+      "integrity": "sha1-b+hA51oRYAydkehLM8RY4cRqNSk=",
       "dev": true
     },
     "kind-of": {
@@ -7088,9 +7085,9 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "typescript": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz",
-      "integrity": "sha1-QMfm6eXaeWG3cYtVUF+crJSHpgc="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q="
     },
     "ultron": {
       "version": "1.0.2",

package.json

@@ -27,20 +27,20 @@
   "dependencies": {
     "@saltyrtc/client": "^0.10.0",
     "@saltyrtc/task-webrtc": "^0.10.0",
-    "@types/angular": "~1.5.23",
-    "@types/angular-material": "~1.1.43",
-    "@types/angular-sanitize": "~1.3.4",
+    "@types/angular": "^1.6.43",
+    "@types/angular-material": "^1.1.58",
+    "@types/angular-sanitize": "^1.3.7",
     "@types/angular-translate": "~2.4.34",
-    "@types/angular-ui-router": "~1.1.35",
+    "@types/angular-ui-router": "^1.1.40",
     "@types/filesaver": "~0.0.30",
     "@types/jquery": "^2.0.48",
-    "@types/msgpack-lite": "~0.1.4",
-    "@types/webrtc": "~0.0.21",
+    "@types/msgpack-lite": "^0.1.6",
+    "@types/webrtc": "0.0.23",
     "angular": "~1.5.10",
     "angular-animate": "~1.5.10",
     "angular-aria": "~1.5.10",
-    "angular-material": "~1.1.1",
-    "angular-messages": "~1.6.1",
+    "angular-material": "=1.1.1",
+    "angular-messages": "^1.6.9",
     "angular-qrcode": "~6.2.1",
     "angular-route": "~1.5.10",
     "angular-sanitize": "~1.5.10",
@@ -63,7 +63,7 @@
     "ts-events": "^3.1.5",
     "tsify": "~2.0.1",
     "tweetnacl": "^1.0.0",
-    "typescript": "~2.1.5",
+    "typescript": "~2.6",
     "webrtc-adapter": "~3.4.3"
   },
   "devDependencies": {
@@ -74,7 +74,7 @@
     "karma": "~1.5.0",
     "karma-chrome-launcher": "~2.0.0",
     "karma-firefox-launcher": "~1.0.0",
-    "karma-jasmine": "~1.1.0",
+    "karma-jasmine": "^1.1.1",
     "tslint": "~4.4.2"
   }
 }

src/services/contact.ts

@@ -28,14 +28,10 @@ export class ContactService {
     public requiredDetails(contactReceiver: threema.ContactReceiver): Promise<threema.ContactReceiver> {
         return new Promise((resolve, reject) => {
             if (contactReceiver.systemContact === undefined) {
-                // load
+                // System contact not available yet. Load it!
                 this.webClientService.requestContactDetail(contactReceiver)
-                    .then(() => {
-                        resolve(resolve);
-                    })
-                    .catch((data) => {
-                        reject(data);
-                    });
+                    .then((data) => resolve(data))
+                    .catch((data) => reject(data));
             } else {
                 resolve(contactReceiver);
             }

src/services/uri.ts

@@ -23,9 +23,6 @@ export class UriService {
      * Based on http://stackoverflow.com/a/8649003/284318
      */
     public parseQueryParams(query: string) {
-        if (!(typeof query === 'string' || query instanceof String)) {
-            return null;
-        }
         if (query.length === 0) {
             return {};
         }

src/types/notification-api.d.ts

@@ -1,63 +0,0 @@
-/**
- * This file is part of Threema Web.
- *
- * Threema Web is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Threema Web. If not, see <http://www.gnu.org/licenses/>.
- */
-
-interface Notification {
-    actions: string[];
-    badge: string;
-    body: string;
-    data: any;
-    dir: 'auto' | 'ltr' | 'rtl';
-    lang: string;
-    tag: string;
-    icon: string;
-    requireInteraction: boolean;
-    silent: boolean;
-    timestamp: any;
-    title: string;
-    vibrate: number[];
-    close(): void;
-
-    onclick: (Event) => void;
-    onerror: () => void;
-}
-
-interface NotificationInit {
-    dir?: 'auto' | 'ltr' | 'rtl';
-    lang?: string;
-    badge?: string;
-    body?: string;
-    tag?: string;
-    icon?: string;
-    data?: any;
-    vibrate?: number[];
-    renotify?: boolean;
-    silent?: boolean;
-    sound?: string;
-    noscreen?: boolean;
-    sticky?: boolean;
-}
-
-interface NotificationStatic {
-    new(title: string, options?: NotificationInit): Notification;
-    permission: string;
-    requestPermission(callback: (string) => void): void;
-    requestPermission(): Promise<string>;
-}
-
-interface Window {
-    Notification: NotificationStatic;
-}