From 668062c11df0a018259833fc5d7a7e8b6c8b5bc4 Mon Sep 17 00:00:00 2001
From: Anduin Xue <anduin@aiursoft.com>
Date: Sat, 3 Aug 2019 00:09:30 +0800
Subject: [PATCH 01/21] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 49852d26..5bb29669 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kahla",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "description": "Kahla is a cross-platform business messaging app.",
   "author": "Aiursoft <postmaster@aiursoft.com> (https://www.aiursoft.com/)",
   "build": {

From 477b0cbeeb7a2fb9cbe75741392f898488251b0d Mon Sep 17 00:00:00 2001
From: xxyzz <elephantpolar@gmail.com>
Date: Sun, 4 Aug 2019 18:14:05 +0800
Subject: [PATCH 02/21] get messages when change timer

---
 src/app/Models/Timers.ts           | 10 ++++++++++
 src/app/Services/MessageService.ts |  2 ++
 src/app/Services/TimerService.ts   | 22 ++++------------------
 3 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 src/app/Models/Timers.ts

diff --git a/src/app/Models/Timers.ts b/src/app/Models/Timers.ts
new file mode 100644
index 00000000..06157d7f
--- /dev/null
+++ b/src/app/Models/Timers.ts
@@ -0,0 +1,10 @@
+export enum Timers {
+    '5s' = 5,
+    '30s' = 30,
+    '1m' = 60,
+    '10m' = 600,
+    '1h' = 3600,
+    '1d' = 3600 * 24,
+    '1w' = 3600 * 24 * 7,
+    'off' = Math.pow(2, 31) - 1
+}
diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts
index b6afc0c3..ae92f76f 100644
--- a/src/app/Services/MessageService.ts
+++ b/src/app/Services/MessageService.ts
@@ -124,6 +124,8 @@ export class MessageService {
                     this.timerService.updateDestructTime(evt.newTimer);
                     Swal.fire('Self-destruct timer updated!', 'Your current message life time is: ' +
                         this.timerService.destructTime, 'info');
+                    this.localMessages = [];
+                    this.getMessages(0, this.conversation.id, -1, 15);
                 }
                 break;
             }
diff --git a/src/app/Services/TimerService.ts b/src/app/Services/TimerService.ts
index 3d1a65d5..63333c1f 100644
--- a/src/app/Services/TimerService.ts
+++ b/src/app/Services/TimerService.ts
@@ -1,12 +1,14 @@
 import { Injectable } from '@angular/core';
 import Swal from 'sweetalert2';
 import { ConversationApiService } from './ConversationApiService';
+import { Timers } from '../Models/Timers';
 
 @Injectable({
     providedIn: 'root'
 })
 export class TimerService {
     public destructTime = 'off';
+    private formerTimer = Timers.off;
 
     constructor(
         private conversationApiService: ConversationApiService) {}
@@ -28,7 +30,7 @@ export class TimerService {
             inputPlaceholder: 'Select one',
             showCancelButton: true
         }).then(selected => {
-            if (selected.value) {
+            if (selected.value && selected.value !== this.formerTimer) {
                 this.conversationApiService.UpdateMessageLifeTime(conversationId, selected.value)
                     .subscribe(result => {
                         this.updateDestructTime(selected.value);
@@ -50,22 +52,6 @@ export class TimerService {
 
     private getDestructTime(time: number): string {
         time = Number(time);
-        if (time === 5) {
-            return '5s';
-        } else if (time === 30) {
-            return '30s';
-        } else if (time === 60) {
-            return '1m';
-        } else if (time === 600) {
-            return '10m';
-        } else if (time === 3600) {
-            return '1h';
-        } else if (time === 3600 * 24) {
-            return '1d';
-        } else if (time === 3600 * 24 * 7) {
-            return '1w';
-        } else {
-            return 'off';
-        }
+        return Timers[time];
     }
 }

From df0eb32b04265559ed3957f96cc18fbf9e2471c0 Mon Sep 17 00:00:00 2001
From: Anduin Xue <anduin@aiursoft.com>
Date: Sun, 4 Aug 2019 22:36:47 +0800
Subject: [PATCH 03/21] Prevent the app to rotate.

Prevent the app to rotate even when the user locks the screen.

In this mode, if the user locks the screen, the PWA app will not rotate.

But if the user did not lock it, it will rotate correctly. And this is expected.
---
 src/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/manifest.json b/src/manifest.json
index aa4afc84..2c95a494 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -23,7 +23,7 @@
     "background_color": "#fff",
     "theme_color": "#fff",
     "display": "standalone",
-    "orientation": "any",
+    "orientation": "portrait",
     "related_applications": [{
         "platform": "play",
         "url": "https://play.google.com/store/apps/details?id=com.aiursoft.kahla"

From 9b24bb93677af6eecc7e13e1569ceb4edfeb29c8 Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Tue, 6 Aug 2019 09:41:12 +0800
Subject: [PATCH 04/21] fix: better scroll behave in discovery page close #606

---
 src/app/Controllers/discover.component.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/Controllers/discover.component.ts b/src/app/Controllers/discover.component.ts
index 25ada951..d4cb386b 100644
--- a/src/app/Controllers/discover.component.ts
+++ b/src/app/Controllers/discover.component.ts
@@ -3,6 +3,7 @@ import { FriendsApiService } from '../Services/FriendsApiService';
 import { DiscoverUser } from '../Models/DiscoverUser';
 import { Values } from '../values';
 import Swal from 'sweetalert2';
+import { HomeService } from '../Services/HomeService';
 
 @Component({
     templateUrl: '../Views/discover.html',
@@ -17,7 +18,8 @@ export class DiscoverComponent implements OnInit {
     public loadingImgURL = Values.loadingImgURL;
 
     constructor(
-        private friendsApiService: FriendsApiService) {
+        private friendsApiService: FriendsApiService,
+        private homeService: HomeService) {
         }
 
     public ngOnInit(): void {
@@ -30,11 +32,13 @@ export class DiscoverComponent implements OnInit {
             users.items.forEach(item => {
                 item.targetUser.avatarURL = Values.fileAddress + item.targetUser.headImgFileKey;
             });
+            const top = this.homeService.contentWrapper.scrollTop;
             this.users = users.items;
             if (this.users.length < this.amount) {
                 this.noMoreUsers = true;
             }
             this.loading = false;
+            setTimeout(() => this.homeService.contentWrapper.scrollTo(0, top), 0);
             this.amount += 15;
         }, () => {
             this.loading = false;

From 822ef9b0ab85b425dbd929a4602f4259c39c7b71 Mon Sep 17 00:00:00 2001
From: Anduin Xue <anduin@aiursoft.com>
Date: Tue, 6 Aug 2019 18:35:32 +0800
Subject: [PATCH 05/21] Update manifest.json

---
 src/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/manifest.json b/src/manifest.json
index 2c95a494..8dfd97a0 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -23,7 +23,7 @@
     "background_color": "#fff",
     "theme_color": "#fff",
     "display": "standalone",
-    "orientation": "portrait",
+    "orientation": "portrait-primary",
     "related_applications": [{
         "platform": "play",
         "url": "https://play.google.com/store/apps/details?id=com.aiursoft.kahla"

From 52d1c7509199bb235df5256be0bcf260fb0cdf14 Mon Sep 17 00:00:00 2001
From: Anduin Xue <anduin@aiursoft.com>
Date: Tue, 6 Aug 2019 18:44:20 +0800
Subject: [PATCH 06/21] Suggest the user to download the native app.

---
 src/manifest.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/manifest.json b/src/manifest.json
index 8dfd97a0..24c208ca 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -24,9 +24,10 @@
     "theme_color": "#fff",
     "display": "standalone",
     "orientation": "portrait-primary",
+    "prefer_related_applications": true,
     "related_applications": [{
         "platform": "play",
-        "url": "https://play.google.com/store/apps/details?id=com.aiursoft.kahla"
+        "id": "com.aiursoft.kahla"
     }],
     "share_target": {
         "action": "/share-target/",

From b63f45c99d57c2e0c11e532cbf0c4383bf30e256 Mon Sep 17 00:00:00 2001
From: Anduin Xue <anduin@aiursoft.com>
Date: Tue, 6 Aug 2019 18:46:08 +0800
Subject: [PATCH 07/21] Use black-translucent for apple

---
 src/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.html b/src/index.html
index 81cf51df..317adae6 100644
--- a/src/index.html
+++ b/src/index.html
@@ -12,7 +12,7 @@
   <link rel="apple-touch-icon" href="/assets/apple-touch-icon-256.png">
   <meta name="apple-mobile-web-app-title" content="Kahla">
   <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
   <style>
     ::-webkit-scrollbar {

From 67e6df6951ec32918e1f5ca06bb93cfd0f60e52f Mon Sep 17 00:00:00 2001
From: xxyzz <elephantpolar@gmail.com>
Date: Tue, 6 Aug 2019 20:49:33 +0800
Subject: [PATCH 08/21] avatar path

---
 src/app/Controllers/add-friend.component.ts       |  4 ++--
 src/app/Controllers/advanced-setting.component.ts |  2 +-
 src/app/Controllers/discover.component.ts         |  2 +-
 src/app/Controllers/group.component.ts            |  4 ++--
 src/app/Controllers/manageGroup.component.ts      |  6 +++---
 src/app/Controllers/settings.component.ts         |  2 +-
 src/app/Controllers/talking.component.ts          |  4 ----
 src/app/Controllers/user.component.ts             |  2 +-
 src/app/Controllers/userDetail.component.ts       |  4 ++--
 src/app/Models/ContactInfo.ts                     |  2 +-
 src/app/Models/Conversation.ts                    |  2 +-
 src/app/Models/GroupConversation.ts               |  2 +-
 src/app/Models/GroupsResults.ts                   |  2 +-
 src/app/Models/KahlaUser.ts                       |  2 +-
 src/app/Models/UploadFile.ts                      |  2 +-
 src/app/Services/AuthApiService.ts                |  4 ++--
 src/app/Services/CacheService.ts                  |  8 ++++----
 src/app/Services/FilesApiService.ts               |  2 +-
 src/app/Services/GroupsApiService.ts              |  4 ++--
 src/app/Services/InitService.ts                   |  2 +-
 src/app/Services/MessageService.ts                |  2 +-
 src/app/Services/UploadService.ts                 | 14 ++++++--------
 src/app/Views/app.html                            |  2 +-
 src/app/Views/talking.html                        |  4 ++--
 src/app/values.ts                                 |  2 +-
 src/sw.js                                         |  2 +-
 26 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/src/app/Controllers/add-friend.component.ts b/src/app/Controllers/add-friend.component.ts
index 69168e4a..c4ad0658 100644
--- a/src/app/Controllers/add-friend.component.ts
+++ b/src/app/Controllers/add-friend.component.ts
@@ -52,10 +52,10 @@ export class AddFriendComponent implements OnInit {
         this.friendsApiService.SearchEverything(term.trim(), this.searchNumbers).subscribe(result => {
             if (result.code === 0) {
                 result.users.forEach(user => {
-                    user.avatarURL = Values.fileAddress + user.headImgFileKey;
+                    user.avatarURL = Values.fileAddress + user.iconFilePath;
                 });
                 result.groups.forEach(group => {
-                    group.avatarURL = Values.fileAddress + group.imageKey;
+                    group.avatarURL = Values.fileAddress + group.imagePath;
                 });
                 this.results = result;
                 if (this.showUsers && result.usersCount === 0 && result.groupsCount !== 0) {
diff --git a/src/app/Controllers/advanced-setting.component.ts b/src/app/Controllers/advanced-setting.component.ts
index a8b796c3..f8ef362c 100644
--- a/src/app/Controllers/advanced-setting.component.ts
+++ b/src/app/Controllers/advanced-setting.component.ts
@@ -30,7 +30,7 @@ export class AdvancedSettingComponent implements OnInit {
         } else {
             this.authApiService.Me().subscribe(p => {
                 this.me = p.value;
-                this.me.avatarURL = Values.fileAddress + this.me.headImgFileKey;
+                this.me.avatarURL = Values.fileAddress + this.me.iconFilePath;
             });
         }
     }
diff --git a/src/app/Controllers/discover.component.ts b/src/app/Controllers/discover.component.ts
index 25ada951..ab8ad585 100644
--- a/src/app/Controllers/discover.component.ts
+++ b/src/app/Controllers/discover.component.ts
@@ -28,7 +28,7 @@ export class DiscoverComponent implements OnInit {
         this.loading = true;
         this.friendsApiService.Discover(this.amount).subscribe(users => {
             users.items.forEach(item => {
-                item.targetUser.avatarURL = Values.fileAddress + item.targetUser.headImgFileKey;
+                item.targetUser.avatarURL = Values.fileAddress + item.targetUser.iconFilePath;
             });
             this.users = users.items;
             if (this.users.length < this.amount) {
diff --git a/src/app/Controllers/group.component.ts b/src/app/Controllers/group.component.ts
index 3305af7b..b500c370 100644
--- a/src/app/Controllers/group.component.ts
+++ b/src/app/Controllers/group.component.ts
@@ -44,9 +44,9 @@ export class GroupComponent implements OnInit {
                 this.messageService.conversation = conversation;
                 this.conversation = <GroupConversation>conversation;
                 this.groupMembers = conversation.users.length;
-                this.conversation.avatarURL = Values.fileAddress + (<GroupConversation>this.conversation).groupImageKey;
+                this.conversation.avatarURL = Values.fileAddress + (<GroupConversation>this.conversation).groupImagePath;
                 this.conversation.users.forEach(user => {
-                    user.user.avatarURL = Values.fileAddress + user.user.headImgFileKey;
+                    user.user.avatarURL = Values.fileAddress + user.user.iconFilePath;
                     try {
                         if (user.userId === this.messageService.me.id) {
                             this.muted = user.muted;
diff --git a/src/app/Controllers/manageGroup.component.ts b/src/app/Controllers/manageGroup.component.ts
index 437c18c5..c8fcacc4 100644
--- a/src/app/Controllers/manageGroup.component.ts
+++ b/src/app/Controllers/manageGroup.component.ts
@@ -48,12 +48,12 @@ export class ManageGroupComponent implements OnInit {
                 .subscribe(conversation => {
                     this.messageService.conversation = conversation;
                     this.conversation = <GroupConversation>conversation;
-                    this.conversation.avatarURL = Values.fileAddress + this.conversation.groupImageKey;
+                    this.conversation.avatarURL = Values.fileAddress + this.conversation.groupImagePath;
                     this.newGroupName = this.conversation.groupName;
                 });
         } else {
             this.conversation = <GroupConversation>this.messageService.conversation;
-            this.conversation.avatarURL = Values.fileAddress + this.conversation.groupImageKey;
+            this.conversation.avatarURL = Values.fileAddress + this.conversation.groupImagePath;
             this.newGroupName = this.conversation.groupName;
         }
     }
@@ -132,7 +132,7 @@ export class ManageGroupComponent implements OnInit {
     }
 
     public saveInfo() {
-        this.groupsApiService.UpdateGroupInfo(this.conversation.groupName, this.conversation.groupImageKey, this.newGroupName)
+        this.groupsApiService.UpdateGroupInfo(this.conversation.groupName, this.conversation.groupImagePath, this.newGroupName)
             .subscribe(res => {
             if (res.code === 0) {
                 Swal.fire('Success', res.message, 'success');
diff --git a/src/app/Controllers/settings.component.ts b/src/app/Controllers/settings.component.ts
index d28d35dd..e5f9cdb5 100644
--- a/src/app/Controllers/settings.component.ts
+++ b/src/app/Controllers/settings.component.ts
@@ -29,7 +29,7 @@ export class SettingsComponent implements OnInit {
             this.authApiService.Me().subscribe(p => {
                 if (p.code === 0) {
                     this.messageService.me = p.value;
-                    this.messageService.me.avatarURL = Values.fileAddress + p.value.headImgFileKey;
+                    this.messageService.me.avatarURL = Values.fileAddress + p.value.iconFilePath;
                 }
             });
         }
diff --git a/src/app/Controllers/talking.component.ts b/src/app/Controllers/talking.component.ts
index 7d4aa7c4..97776beb 100644
--- a/src/app/Controllers/talking.component.ts
+++ b/src/app/Controllers/talking.component.ts
@@ -398,10 +398,6 @@ export class TalkingComponent implements OnInit, OnDestroy {
         this.showUserList = false;
     }
 
-    public getHeadImgUrl(fileKey: number): string {
-        return Values.fileAddress + fileKey;
-    }
-
     public ngOnDestroy(): void {
         this.destroyCurrent();
         this.homeService.contentWrapper.onscroll = null;
diff --git a/src/app/Controllers/user.component.ts b/src/app/Controllers/user.component.ts
index 0fa47357..52a10a0c 100644
--- a/src/app/Controllers/user.component.ts
+++ b/src/app/Controllers/user.component.ts
@@ -44,7 +44,7 @@ export class UserComponent implements OnInit {
                 this.conversationId = response.conversationId;
                 this.sentRequest = response.sentRequest;
                 this.pendingRequest = response.pendingRequest;
-                this.info.avatarURL = Values.fileAddress + this.info.headImgFileKey;
+                this.info.avatarURL = Values.fileAddress + this.info.iconFilePath;
             });
     }
 
diff --git a/src/app/Controllers/userDetail.component.ts b/src/app/Controllers/userDetail.component.ts
index a08836a8..06676f45 100644
--- a/src/app/Controllers/userDetail.component.ts
+++ b/src/app/Controllers/userDetail.component.ts
@@ -36,7 +36,7 @@ export class UserDetailComponent implements OnInit {
     if (!this.messageService.me) {
       this.authApiService.Me().subscribe(p => {
         this.user = p.value;
-        this.user.avatarURL = Values.fileAddress + this.user.headImgFileKey;
+        this.user.avatarURL = Values.fileAddress + this.user.iconFilePath;
       });
     } else {
       this.user = Object.assign({}, this.messageService.me);
@@ -57,7 +57,7 @@ export class UserDetailComponent implements OnInit {
     saveButton.textContent = 'Saving...';
     const hideEmail = (<HTMLInputElement>document.querySelector('#toggleHideEmail')).checked;
     this.user.makeEmailPublic = !hideEmail;
-    this.authApiService.UpdateInfo(this.user.nickName, this.user.bio, this.user.headImgFileKey, hideEmail)
+    this.authApiService.UpdateInfo(this.user.nickName, this.user.bio, this.user.iconFilePath, hideEmail)
       .subscribe((response) => {
         if (response.code === 0) {
           this.messageService.me = Object.assign({}, this.user);
diff --git a/src/app/Models/ContactInfo.ts b/src/app/Models/ContactInfo.ts
index 35094569..81cb4816 100644
--- a/src/app/Models/ContactInfo.ts
+++ b/src/app/Models/ContactInfo.ts
@@ -1,7 +1,7 @@
 
 export class ContactInfo {
     public displayName: string;
-    public displayImageKey: number;
+    public displayImagePath: number;
     public latestMessage: string;
     public latestMessageTime: Date;
     public unReadAmount: number;
diff --git a/src/app/Models/Conversation.ts b/src/app/Models/Conversation.ts
index f03f7d12..76b61cbf 100644
--- a/src/app/Models/Conversation.ts
+++ b/src/app/Models/Conversation.ts
@@ -5,7 +5,7 @@ export class Conversation {
     public discriminator: string;
     public conversationCreateTime: Date;
     public displayName: string;
-    public displayImageKey: number;
+    public displayImagePath: string;
     public anotherUserId: string;
     public aesKey: string;
     public users: UserGroupRelation[];
diff --git a/src/app/Models/GroupConversation.ts b/src/app/Models/GroupConversation.ts
index 378fe246..5659d921 100644
--- a/src/app/Models/GroupConversation.ts
+++ b/src/app/Models/GroupConversation.ts
@@ -2,7 +2,7 @@ import { Conversation } from './Conversation';
 
 export class GroupConversation extends Conversation {
     public groupName: string;
-    public groupImageKey: number;
+    public groupImagePath: string;
     public hasPassword: boolean;
     public ownerId: string;
 }
diff --git a/src/app/Models/GroupsResults.ts b/src/app/Models/GroupsResults.ts
index 45715e77..6b364e30 100644
--- a/src/app/Models/GroupsResults.ts
+++ b/src/app/Models/GroupsResults.ts
@@ -1,5 +1,5 @@
 export class GroupsResult {
-    public imageKey: number;
+    public imagePath: number;
     public name: string;
     public hasPassword: boolean;
     public ownerId: string;
diff --git a/src/app/Models/KahlaUser.ts b/src/app/Models/KahlaUser.ts
index 346791a6..a808e29f 100644
--- a/src/app/Models/KahlaUser.ts
+++ b/src/app/Models/KahlaUser.ts
@@ -4,7 +4,7 @@
     public bio: string;
     public email: string;
     public emailConfirmed: boolean;
-    public headImgFileKey: number;
+    public iconFilePath: string;
     public id: string;
     public nickName: string;
     public preferedLanguage: string;
diff --git a/src/app/Models/UploadFile.ts b/src/app/Models/UploadFile.ts
index 943a184c..85051452 100644
--- a/src/app/Models/UploadFile.ts
+++ b/src/app/Models/UploadFile.ts
@@ -2,7 +2,7 @@ import { AiurProtocal } from './AiurProtocal';
 
 export class UploadFile extends AiurProtocal {
     public savedFileName: string;
-    public fileKey: number;
+    public filePath: string;
     public fileSize: number;
     public downloadPath: string;
 }
diff --git a/src/app/Services/AuthApiService.ts b/src/app/Services/AuthApiService.ts
index 23c39d28..19a3e479 100644
--- a/src/app/Services/AuthApiService.ts
+++ b/src/app/Services/AuthApiService.ts
@@ -42,11 +42,11 @@ export class AuthApiService {
         return this.apiService.Get(AuthApiService.serverPath + '/Me');
     }
 
-    public UpdateInfo(nickName: string, bio: string, headImgKey: number, hideMyEmail: boolean): Observable<AiurProtocal> {
+    public UpdateInfo(nickName: string, bio: string, headIconPath: string, hideMyEmail: boolean): Observable<AiurProtocal> {
         return this.apiService.Post(AuthApiService.serverPath + '/UpdateInfo', {
             nickName: nickName,
             bio: bio,
-            headImgKey: headImgKey,
+            headIconPath: headIconPath,
             hideMyEmail: hideMyEmail
         });
     }
diff --git a/src/app/Services/CacheService.ts b/src/app/Services/CacheService.ts
index 00e2b555..17bf6810 100644
--- a/src/app/Services/CacheService.ts
+++ b/src/app/Services/CacheService.ts
@@ -42,7 +42,7 @@ export class CacheService {
                         }
                         e.latestMessage = this.modifyMessage(e.latestMessage);
                     }
-                    e.avatarURL = Values.fileAddress + e.displayImageKey;
+                    e.avatarURL = Values.fileAddress + e.displayImagePath;
                 });
                 this.cachedData.conversations = info;
                 this.updateTotalUnread();
@@ -54,10 +54,10 @@ export class CacheService {
             .subscribe(result => {
                 if (result.code === 0) {
                     result.users.forEach(user => {
-                        user.avatarURL = Values.fileAddress + user.headImgFileKey;
+                        user.avatarURL = Values.fileAddress + user.iconFilePath;
                     });
                     result.groups.forEach(group => {
-                        group.avatarURL = Values.fileAddress + group.imageKey;
+                        group.avatarURL = Values.fileAddress + group.imagePath;
                     });
 
                     this.cachedData.friends = result;
@@ -69,7 +69,7 @@ export class CacheService {
         this.friendsApiService.MyRequests().subscribe(response => {
             this.cachedData.requests = response.items;
             response.items.forEach(item => {
-                item.creator.avatarURL = Values.fileAddress + item.creator.headImgFileKey;
+                item.creator.avatarURL = Values.fileAddress + item.creator.iconFilePath;
             });
             this.totalRequests = response.items.filter(t => !t.completed).length;
         });
diff --git a/src/app/Services/FilesApiService.ts b/src/app/Services/FilesApiService.ts
index 1a8180f4..7f951310 100644
--- a/src/app/Services/FilesApiService.ts
+++ b/src/app/Services/FilesApiService.ts
@@ -8,7 +8,7 @@ import { FilePath } from '../Models/FilePath';
 
 @Injectable()
 export class FilesApiService {
-    private static serverPath = '/files';
+    private static serverPath = '/Storage';
 
     constructor(
         private apiService: ApiService,
diff --git a/src/app/Services/GroupsApiService.ts b/src/app/Services/GroupsApiService.ts
index 932571bb..6c5e8fc6 100644
--- a/src/app/Services/GroupsApiService.ts
+++ b/src/app/Services/GroupsApiService.ts
@@ -46,10 +46,10 @@ export class GroupsApiService {
         });
     }
 
-    public UpdateGroupInfo(groupName: string, avatarKey?: number, newName?: string): Observable<AiurProtocal> {
+    public UpdateGroupInfo(groupName: string, avatarPath?: string, newName?: string): Observable<AiurProtocal> {
         return this.apiService.Post(GroupsApiService.serverPath + '/UpdateGroupInfo', {
             GroupName: groupName,
-            AvatarKey: avatarKey,
+            AvatarPath: avatarPath,
             NewName: newName
         });
     }
diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts
index 46f9e7ea..aead3602 100644
--- a/src/app/Services/InitService.ts
+++ b/src/app/Services/InitService.ts
@@ -61,7 +61,7 @@ export class InitService {
                 this.authApiService.Me().subscribe(p => {
                     if (p.code === 0) {
                         this.messageService.me = p.value;
-                        this.messageService.me.avatarURL = Values.fileAddress + p.value.headImgFileKey;
+                        this.messageService.me.avatarURL = Values.fileAddress + p.value.iconFilePath;
                         this.themeService.ApplyThemeFromRemote(elementRef, p.value);
                         if (!this._electronService.isElectronApp) {
                             this.subscribeUser();
diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts
index b6afc0c3..3dc93690 100644
--- a/src/app/Services/MessageService.ts
+++ b/src/app/Services/MessageService.ts
@@ -339,7 +339,7 @@ export class MessageService {
             event.content = this.cacheService.modifyMessage(event.content);
             const notify = new Notification(event.sender.nickName, {
                 body: event.content,
-                icon: Values.fileAddress + event.sender.headImgFileKey
+                icon: Values.fileAddress + event.sender.iconFilePath
             });
             notify.onclick = function (clickEvent) {
                 clickEvent.preventDefault();
diff --git a/src/app/Services/UploadService.ts b/src/app/Services/UploadService.ts
index 9e8b6bd5..3361214f 100644
--- a/src/app/Services/UploadService.ts
+++ b/src/app/Services/UploadService.ts
@@ -126,7 +126,7 @@ export class UploadService {
                                         [width, height] = [height, width];
                                     }
                                 }
-                                encedMessages = AES.encrypt(`[img]${(<UploadFile>response).fileKey}-${width}-${
+                                encedMessages = AES.encrypt(`[img]${(<UploadFile>response).filePath}-${width}-${
                                     height}-${orientation}`, aesKey).toString();
                                 this.sendMessage(encedMessages, conversationID);
                             }.bind(this),
@@ -134,7 +134,7 @@ export class UploadService {
                         );
                         break;
                     case 1:
-                        encedMessages = AES.encrypt(`[video]${(<UploadFile>response).fileKey}`, aesKey).toString();
+                        encedMessages = AES.encrypt(`[video]${(<UploadFile>response).filePath}`, aesKey).toString();
                         this.sendMessage(encedMessages, conversationID);
                         break;
                     case 2:
@@ -142,7 +142,7 @@ export class UploadService {
                         this.sendMessage(encedMessages, conversationID);
                         break;
                     case 3:
-                        encedMessages = AES.encrypt(`[audio]${(<UploadFile>response).fileKey}`, aesKey).toString();
+                        encedMessages = AES.encrypt(`[audio]${(<UploadFile>response).filePath}`, aesKey).toString();
                         this.sendMessage(encedMessages, conversationID);
                         break;
                     default:
@@ -199,8 +199,7 @@ export class UploadService {
                     this.updateAlertProgress(Number(response));
                 } else if (response != null && (<UploadFile>response).code === 0) {
                     Swal.close();
-                    user.headImgFileKey = (<UploadFile>response).fileKey;
-                    user.avatarURL = (<UploadFile>response).downloadPath;
+                    user.avatarURL = Values.fileAddress + (<UploadFile>response).filePath;
                 }
             });
             alert.then(result => {
@@ -223,8 +222,7 @@ export class UploadService {
                     this.updateAlertProgress(Number(response));
                 } else if (response != null && (<UploadFile>response).code === 0) {
                     Swal.close();
-                    group.groupImageKey = (<UploadFile>response).fileKey;
-                    group.avatarURL = Values.fileAddress + group.groupImageKey;
+                    group.avatarURL = Values.fileAddress + (<UploadFile>response).filePath;
                 }
             });
             alert.then(result => {
@@ -300,7 +298,7 @@ export class UploadService {
         let message = '[file]';
         const units = ['kB', 'MB', 'GB'];
         const thresh = 1000;
-        message += response.fileKey + '-';
+        message += response.filePath + '-';
         message += response.savedFileName.replace(/-/g, '') + '-';
         if (response.fileSize < thresh) {
             message += response.fileSize + ' B';
diff --git a/src/app/Views/app.html b/src/app/Views/app.html
index 70f58161..802a4a70 100644
--- a/src/app/Views/app.html
+++ b/src/app/Views/app.html
@@ -10,6 +10,6 @@
 <!-- Show an empty component when no reasonable component to show. -->
 <div class="content-empty" *ngIf="route.isActive('/home', false) && homeService.wideScreenEnabled && messageService.me">
     <h2>Welcome back, {{ messageService.me.nickName }}.</h2>
-    <img src="{{ messageService.me.avatarURL}}?w=100&h=100" (click)="homeService.currentPage = 2">
+    <img style="width: 100px" src="{{ messageService.me.avatarURL}}?w=200&h=200" (click)="homeService.currentPage = 2">
     <h3>Start talking now!</h3>
 </div>
diff --git a/src/app/Views/talking.html b/src/app/Views/talking.html
index 12a9367e..14cbb5c7 100644
--- a/src/app/Views/talking.html
+++ b/src/app/Views/talking.html
@@ -7,7 +7,7 @@
         <div class="last-read-bar" *ngIf="message.lastRead">--- LAST READ ---</div>
         <div *ngIf="message.local || message.timeStamp + messageService.conversation.maxLiveSeconds * 1000 > Date.now()">
             <div class="chat-avatar" routerLink="/user/{{message.senderId}}">
-                <img src="{{getHeadImgUrl(message.sender.headImgFileKey)}}?w=80&h=80">
+                <img src="{{fileAddress + message.sender.iconFilePath}}?w=80&h=80">
             </div>
             <div class="chat-text">
                 <div class="chat-content" [class.single-emoji]="message.isEmoji">
@@ -105,7 +105,7 @@ <h5>{{message.content.split('-')[1]}}</h5>
     <ul *ngIf="showUserList" class="userList" [ngClass]="{'oneResult': matchedUsers.length == 1}"
         [style.max-height.px]="getAtListMaxHeight()">
         <li *ngFor="let user of matchedUsers" (click)="complete(user.nickName)" class="menu-button">
-            <img class="img" src="{{ getHeadImgUrl(user.headImgFileKey) }}">
+            <img class="img" src="{{ fileAddress + user.iconFilePath }}">
             <div class="text">{{ user.nickName }}</div>
         </li>
     </ul>
diff --git a/src/app/values.ts b/src/app/values.ts
index 9536e898..d9bba04d 100644
--- a/src/app/values.ts
+++ b/src/app/values.ts
@@ -1,5 +1,5 @@
 export class Values {
-    public static fileAddress = 'https://oss.aiursoft.com/download/fromkey/';
+    public static fileAddress = 'https://probe.aiursoft.com/Download/InSites/';
     public static loadingImgURL = 'https://cdn.aiursoft.com/images/loading.gif';
     public static sourceCodeURL = 'https://github.com/AiursoftWeb/Kahla.App/commit/';
 }
diff --git a/src/sw.js b/src/sw.js
index 010182f5..c8e5a2ae 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -119,7 +119,7 @@ self.addEventListener('push', function(event) {
                 if (showNotification) {
                     return self.registration.showNotification(title, {
                         body: message,
-                        icon: fileLink + data.sender.headImgFileKey,
+                        icon: fileLink + data.sender.iconFilePath,
                         renotify: true,
                         tag: data.conversationId.toString()
                     });

From ca4fee63d6412de2bd0c005dcdb890f085167e37 Mon Sep 17 00:00:00 2001
From: xxyzz <elephantpolar@gmail.com>
Date: Tue, 6 Aug 2019 21:00:48 +0800
Subject: [PATCH 09/21] fix type

---
 src/app/Models/ContactInfo.ts   | 2 +-
 src/app/Models/GroupsResults.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/Models/ContactInfo.ts b/src/app/Models/ContactInfo.ts
index 81cb4816..476f6c30 100644
--- a/src/app/Models/ContactInfo.ts
+++ b/src/app/Models/ContactInfo.ts
@@ -1,7 +1,7 @@
 
 export class ContactInfo {
     public displayName: string;
-    public displayImagePath: number;
+    public displayImagePath: string;
     public latestMessage: string;
     public latestMessageTime: Date;
     public unReadAmount: number;
diff --git a/src/app/Models/GroupsResults.ts b/src/app/Models/GroupsResults.ts
index 6b364e30..80f640c0 100644
--- a/src/app/Models/GroupsResults.ts
+++ b/src/app/Models/GroupsResults.ts
@@ -1,5 +1,5 @@
 export class GroupsResult {
-    public imagePath: number;
+    public imagePath: string;
     public name: string;
     public hasPassword: boolean;
     public ownerId: string;

From 608f87aae1ef9437b108de3bc3b4ca5fd0e363b7 Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Wed, 7 Aug 2019 00:26:03 +0800
Subject: [PATCH 10/21] fix: update user/group avatar path when the upload is
 done

---
 src/app/Services/UploadService.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/Services/UploadService.ts b/src/app/Services/UploadService.ts
index 3361214f..75b016a9 100644
--- a/src/app/Services/UploadService.ts
+++ b/src/app/Services/UploadService.ts
@@ -199,7 +199,8 @@ export class UploadService {
                     this.updateAlertProgress(Number(response));
                 } else if (response != null && (<UploadFile>response).code === 0) {
                     Swal.close();
-                    user.avatarURL = Values.fileAddress + (<UploadFile>response).filePath;
+                    user.iconFilePath = (<UploadFile>response).filePath;
+                    user.avatarURL = Values.fileAddress + user.iconFilePath;
                 }
             });
             alert.then(result => {
@@ -222,7 +223,8 @@ export class UploadService {
                     this.updateAlertProgress(Number(response));
                 } else if (response != null && (<UploadFile>response).code === 0) {
                     Swal.close();
-                    group.avatarURL = Values.fileAddress + (<UploadFile>response).filePath;
+                    group.groupImagePath = (<UploadFile>response).filePath;
+                    group.avatarURL = Values.fileAddress + group.groupImagePath;
                 }
             });
             alert.then(result => {

From c3375631dac258369ccb4a42b5a3faf46f708309 Mon Sep 17 00:00:00 2001
From: Anduin Xue <anduin@aiursoft.com>
Date: Wed, 7 Aug 2019 10:31:30 +0800
Subject: [PATCH 11/21] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 77c2a2ea..0fbc4f4f 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,14 @@
 
 [![Build status](https://aiursoft.visualstudio.com/Star/_apis/build/status/Kahla%20App%20Build)](https://aiursoft.visualstudio.com/Star/_build/latest?definitionId=4)
 
-<a href='https://play.google.com/store/apps/details?id=com.aiursoft.kahla'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/></a>
-
 Welcome to Kahla. Kahla is a cross-platform business messaging app. Kahla also achieved one target to use one copy of code and target all platforms.
 
 <img src="https://ui.cdn.aiursoft.com/images/kahla-demo.png" alt="screenshot" width="500"/>
 
 Try it here: [web.kahla.app](https://web.kahla.app)
 
+Or <a href='https://play.google.com/store/apps/details?id=com.aiursoft.kahla'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/></a>
+
 Kahla currently targets Windows, Linux, macOS, Android, and iOS.
 
 Kahla is built with Angular 8 and typescript. And [Kahla Server](https://github.com/AiursoftWeb/Kahla) is built with .NET Core.

From 1d773d08040b4ffefa3e9790503d018b8e0b851e Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Wed, 7 Aug 2019 11:27:38 +0800
Subject: [PATCH 12/21] feat: add a `add to home screen` button to about page

---
 src/app/Controllers/about.component.ts |  13 +++++++++++++
 src/app/Controllers/app.component.ts   |   5 +++++
 src/app/Services/HomeService.ts        |   2 ++
 src/app/Views/about.html               |  12 ++++++++++++
 src/assets/192x192.png                 | Bin 0 -> 13697 bytes
 src/manifest.json                      |   7 ++++++-
 6 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/192x192.png

diff --git a/src/app/Controllers/about.component.ts b/src/app/Controllers/about.component.ts
index 20c8d741..39be2ec8 100644
--- a/src/app/Controllers/about.component.ts
+++ b/src/app/Controllers/about.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
 import { CheckService } from '../Services/CheckService';
 import { Values } from '../values';
+import { HomeService } from '../Services/HomeService';
 
 @Component({
     templateUrl: '../Views/about.html',
@@ -14,10 +15,22 @@ export class AboutComponent {
     public sourceCodeURL = Values.sourceCodeURL;
     constructor(
         public checkService: CheckService,
+        public homeService: HomeService
     ) {
     }
 
     public check(): void {
         this.checkService.checkVersion(true);
     }
+
+    public pwaAddHomeScreen(): void {
+        this.homeService.pwaHomeScreenPrompt.prompt();
+        this.homeService.pwaHomeScreenPrompt.userChoice
+            .then((choiceResult) => {
+                if (choiceResult.outcome === 'accepted') {
+                    this.homeService.pwaHomeScreenSuccess = true;
+                }
+                this.homeService.pwaHomeScreenPrompt = null;
+            });
+    }
 }
diff --git a/src/app/Controllers/app.component.ts b/src/app/Controllers/app.component.ts
index 1c5ba908..a48d1737 100644
--- a/src/app/Controllers/app.component.ts
+++ b/src/app/Controllers/app.component.ts
@@ -50,6 +50,11 @@ export class AppComponent implements OnInit, AfterViewInit {
         }
     }
 
+    @HostListener('window:beforeinstallprompt', ['$event'])
+    onbeforeinstallprompt(e: any) {
+        this.homeService.pwaHomeScreenPrompt = e;
+    }
+
     public ngOnInit(): void {
         // Temporary apply the local theme setting
         this.themeService.ApplyThemeFromLocal(this.elementRef);
diff --git a/src/app/Services/HomeService.ts b/src/app/Services/HomeService.ts
index eeb94dd1..3163f84b 100644
--- a/src/app/Services/HomeService.ts
+++ b/src/app/Services/HomeService.ts
@@ -6,6 +6,8 @@ import { clearAllBodyScrollLocks, disableBodyScroll } from 'body-scroll-lock';
 })
 export class HomeService {
     public currentPage = 0;
+    public pwaHomeScreenPrompt: any;
+    public pwaHomeScreenSuccess = false;
 
     public get wideScreenEnabled(): boolean {
         return window.innerWidth > 730 && window.innerHeight < window.innerWidth;
diff --git a/src/app/Views/about.html b/src/app/Views/about.html
index 388f2f1f..9c45905a 100644
--- a/src/app/Views/about.html
+++ b/src/app/Views/about.html
@@ -12,6 +12,18 @@ <h4>Kahla {{checkService.version}}</h4>
 
 <div class="menu-holder"></div>
 
+<div class="menu-button" *ngIf="homeService.pwaHomeScreenPrompt" (click)="pwaAddHomeScreen()">
+    <div class="img">
+        <i class="fa fa-plus-square" aria-hidden="true"></i>
+    </div>
+    <div class="text">Add to home screen</div>
+</div>
+<div class="menu-button" *ngIf="homeService.pwaHomeScreenSuccess">
+    <div class="img">
+        <i class="fa fa-check" aria-hidden="true"></i>
+    </div>
+    <div class="text">Success</div>
+</div>
 <div *ngIf="checkService.checking; then checkingButton else checkButton"></div>
 <ng-template #checkButton>
     <div class="menu-button" (click)="check()">
diff --git a/src/assets/192x192.png b/src/assets/192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..d399156b08bf9f9ecd59dafc62fb9ae98564fab3
GIT binary patch
literal 13697
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%0DV3qiR}yWXg`^T9lGmBC{ObOMBT
zZG1eu%+pQ<h`p8;Ddi{7lnR<&V6buxhy&(gEb$|_XTb}P!(u#Zp<IP*K5AtVhsDy@
z(dpq0$b<z1oE(>?4nzK%HQFt73PO#zodMs}jQ@&_lo%%3{yi5D<;1lCBc;{=4EJly
z>5Outq<{%Xx_Cx%9mupeU>*Wq(S}_x;n?mdje9xFnp{{J^hqvS*kIYLN(c>>b)+Ji
zC7^*+yc26Pa+oFwU9;<UQFnNFXy^{Da^VPy*MQKRVrj_$5}E~aPq@Qg%3<np>Z&8d
z&ngMO;UpoZcMQEpoqvAudmBij*EoxckC)=EXy)J;S!W^HpE_A-L=N?5>p<iP)gaS5
zG?-<IE%W`L`UQ8Xw_fCH_^k|)A4B#t6*%g%gk%`z#+nAQ{o*wJ>WocuWh$-8#~$QE
z3>bvBIf1iQst>+?K1iubA7pvBKxv)!{7?G+x-E0FBw4)VgdgYG>%Ann)*h$E>aS%s
z$0=hM=!*<Hz~4BLct4wmqoGAE9xhdCl*cqxos3|+41+?RIXF06odCBvqUdo6wu_T|
z`IAAn6Wp~_fqh}xdEg&RgAy0U7W%Ewu>+i-*U;NZHs3QFzc9T8)9vpO0#<~G7T|Mr
zc*>&T4!I7Ya4KfAmx^-k3Cu#DvVjb>w0I-Rto28#qwuC}wneu!Gk68W2ad3vPWb;g
zlQ_j`BJ$iWh{eK%eTwdKwt2XC=59S*KUQ_?ZKulqfjMtv3YGHh6A;eB<Ee}0ewhPh
zW$};3M%N4B!ZE@iTq>(n8l{xdZrG9jVsy>83g}e3uwpJGx~hY%W7qr^S>o(k7)BXH
zk^|N2_3cW+3diED^7Eyh42}(sXduBXRGSgksI#iUTqHxTG>~3J#G;AotNTsT!)y+c
zU*nA<6A5TKuVZTsqO3>@eIRj9szsJn3-RyV*UBBv)snoZSfGr&CuCBcW>Kd1J9|C0
zG2WCqS1c7<We~4H@6fGeW8igLfkb``pWNyW34u<IXt#qdI<EnuI{{EwPF$bv!I34!
zGu;eOUj>$YNa#ApDh`rJXYz9z=P>yd_eIPk4YRts5r=9_BMGxOj4mFNbX^NssVx7V
zOesz^1ec9aB~)B2G`w`Hadx^=mz2w9o=%QsjA%<4#tDl?5x-iq3hO0sG#Ek(vB1Sn
zkZ1jdy9MShB<GSw3|zJj`krxyWh0*^ekf@CN3VUdNR#n(CtX!@xW~}*Rxl*Cq+8ya
zCpZjhOO0V!e-S){?i`%}6tG(2;^LbLJ5al5ByaCuzkb#0);CWAVRWQ7r^Xb|t08DP
zD_iu4Zqi6kPumr3B~P_EevzrP?iCun#CGTw=i9|&_&BEgssG88S#@Q;zt$BSjq}v*
zf{3Un=-Qoo`3nYN=(}pKpNGdCs1M666gP=I=pq8hB`5+qXURdBH^i8|J$!%tybZ2&
zIOBuhGvI+p5%w(>BKTjauVPPhOt_1UV*>#d3o8O#a}AT9`s_6d8yaQkOktt5k(V!7
zv1)G^BGy0=b6$?<j?ElBJ^eP@Q7IAn2%&;M>B1AG8WSCKH6l8e(^peP%*1<mzGwz5
z?`25f@{IfMw$X9%R07d(J>`#y6K^XO3-Z+o5$oncrl8_<ygLHUk0)Xls$Z4iHVwHV
z6$4aVTwG8CR;W>WhK7e}f#AVE7MO`oT<<I5U9>Z%d{KR&!+T*X!-Jq~1`R6h+rU3&
z@m0F`ZLe<{f{enXXA3u7`8C>ua$x6~mjuPKidog*;J^0f#UALGI{LIGiQfZO)^v{b
zV&48%*r$nrp@J^$+actu?~6c}qX|e>y58Ccwm?79KXcM%iB(J#g<|kpF2R?}4PeAK
zfH>uY#N_0?jtdEJ16Lt5y2BVtQ&T$Oyg?xz!Yp3`vCt}5TtbtB=N9rgdP=3GjX=~&
zeB<QJDG?FeT`~nkva(7_Qtl^hcWqL#T%dyd{0;cenc)NLzBt&DRrK`@ae2#pVBQ3b
zt{5E<LOf_EAH)GgxlA!C|L{<PViB+mO<T2I&Q08I5$Z0oOfD4Ru}_p-gLfH0bQv)?
zBqkMlK(vkZSyPn)hx(`QF#Wn_MC8@eG+nl$oSfX!ksD$jTaYP?-xzbt$ZR)>q%B>&
zj(yn8@W2!ssM-oMTB$*nrryzJMw6RI3d-`Y_rqv++{K-7YHW@FO%4jKpA9zH>GuQ~
zL}pz`EpYt0@RO?Q!U;jqPi;P4kNDsRgm7Dzf<gqk)_HtF8dV(~9T%YWgOrT9-3P0V
z5`+}1@fwgW7SiR+U}fJJ65jyDVg(Hj@?;Nwwah}4O-10L6}5oG{IwXIEBvf}(N3b7
z_3TXawbI<^OE}8e>j*5E5w3Ek3H_lBBkhkX`X^4fcv93|#_z2Ck3P!vkNUI!%><#r
zq1+B7$t5OCAG!Ij&Vfug)MOx{MXDd3Uok^rv3?X&s82{pRKY3AUZ^9f(&3<!RpPo>
ztNO}Io`*0;zuX@(GV`-}N2W<_%;TfLu@Mr+uv|O6OJlJTQ!j5u^OM>!u>?fDI`Te$
z(!BZeR}+^>6O7q(s7)bvmff=7s9{lPrE>wgq*O3Q%aE4~-WWg<DP8kL3q_JIRfqiD
zK!;Efh>98*<P$?Vz&AR`hn;^}V{-GVwKgvNwgEAB$EB;}6w~%6s`$hpo4ABDz<{1U
z0`W>6MHcK4&`UUcALm7i<CZ7ir$Yh#l9lG1iggBUD8EEaAL|liv8y5@@{<sESOvv?
zCe9M751L%iHXidvE*YkSBZW!cyg0|{d+W=8E-48ufRaui&Q|^O33fLQ`O?!&z`7`k
zS3p3Z_De0hEb9j@qzKu#0iRHum|r@^ugTI6XB`;oCY<PGr5Kd|2}VX0G%C0@-E~ws
zl6A^NGSb0G$oUCkC#Hj`ts;lGNdrWfQ3JHm89VNE8gcTUItT+=Z7_GB-FOHgoj;cl
zEWqA=bi__n7DQ3yo{HU&05eO=Sn<w&CDssJrFDep_B*PSZ}Y64pD67N_z~VLl?k=%
zA$kt1p&=&D-Kv)DZuu9xt?^vjYh*FYb^5mZMrTn7@RwADE<=fAzrx^J2E_7;j-P{0
z%`F~w({O%ZeoC;@c=nEFNzf~w209Ix)@|!b^$!xw@}(*Ig+e{Ea{flgrZD7G84*7S
zIp_xTD2l%2yL&l(y^%`OmbXC$p>0VM9jx@PEzt;x6r+8R_OSm5`{OvUa{=VcPhEk%
ze9!V9#5q(6v37CV2s&LJC*IKG5Ds&L@k{V6G0%N$*m(vT;4Y9_wH(3J=1U;KWJcH&
zSbn^y*{mP$q0lBIpBX(Clnt9IalS*aOQe2dovv9RUX$DPnKrw%jDHseE6ts9Tc_;H
z&{^knH6)kDIlwHe1T=H%;-^IF6f@Gz1fGwRy5~rI(9=&DQ83-J;?-T^XxS~!)ipYh
z(v+Px)r)zG?j!Zn$0b5W#5l!OgCjuzAG)Cx7SetH?V4fMD&tcPUKGkgrD24T=Aar!
zazYoXgmRb$QwFbcaQ&gesc-DtR}0CB-!s}SXRhx`3+^3dXup?BF*IX2!La;V1j~mz
z`$zEH9y<u#v20EhUrH@a5PCEgzkmd;J1+->M^v4FQpWKGfuGz4NrVIm(;bP|B`-2C
z@6ceizmkw>T+cRW!crSQ<D2+wjeq5&=@Ro)aLP_mp!k+&%Q1shQD&!aYZXH3wz;4H
zHG%ZqXE7zlP>!cj7`?2X851c#Vr=RUJ4Fl)2S0PS4;Lmiu+cHz|0E%vJ$)fcTfAcB
zl%n=Z_wr24yivRqtY>1GCxV<}sb@H4%2PH3?d<*cW)P85wmsShTSVJkYygV#56ZQa
zz&Jt_&+pQt_!PO`Jp<X)uWwr*u1LH5qk)^%ut-;;UFb4=;#HcY+1u_`4--wWPka(N
z#AiN0Z!D>E_#n=z)NT%{?3@~fY!Quj@_{#2mmmw$s5?~c+`~%quu)L>Tj5Z??$W5F
zZ++1B5c5KE1t_b#hz*F-kBD%IbmFu{7jgN)E$ruFb2;Bl^CX^t-qgWY;=|wgS;D-S
zl$=GTh}U$1og_&Ra_j*o;-!9Z4T7^m&1qI!E$o-(3LH$z&rYTyh?pgj5iTXtg+p%9
z$()5bw~3P%_1jHKvW-7~bZjlgEvP49l%ua@e&gAE<P+_nL3)lR1g8x|Ud0VrMrzVk
zP~~LUfTS%zo7+F3_`RM*t3*d?uRecp<LPC6@l_|Hvo;u^5dV+gq>YdOsWrKoZfO}t
zZE74#>aC)SoGT*Yx2t$8lvaj)%aBGJeEo{u&*|J;Eb<YB&teuGv-xs9Fdt|zq@MoL
zXG)l1e;P;#F+y5xmZ?<eR>w%tF?VWy<txXnaBS{lCg8`<BGze8jWAxVxytkju4adM
zK$TOIABoclR-=n9SxtVzRCVB2Q^4<g73;bmGRmxg8#%hGu^>_;!92ZV4<X>rt&!UC
za21t%fo2Q6Ty3^3nj>V|5=F$(;x6h|g?GvfnO<mul`+e9@!v05q4H?n;*}}t9{eS4
z(*$jSiq@$&^6Qtp&}9uW*4i}A&hBVx(E^=t4|?U0kVtQy**&zwgJNZSYL*R)Lr8Gw
zswSi2NnL1lSWmwFKBByWf)uz_3}$+OCCrU6b`VoXV-6Z(H4-r$AD@x+abpK=!}=_V
zexjp)UCynhC$aPUD3TJFJ*&6VVYUc@MWeO~ub*C4&`Xgjx+#0M%}ZePHZ-XYQ%C1E
z4sWE*@=<qcXHdD5toQ5zOO6Qf{7)@o@t?S}S8f-n9S^F0s1}VYaS?@;>q-fknqf24
z)YJ=aon04VjoG2UG!0loL7t{CM>NZf7Rj9JeP^f6m(MV0>G8O&riEZ`=1HU#rmVKM
zwg{l0Ti6b3C1OXC!$KhWu8{e$h-a(;M7AY~1G5(|C~0*#*(s9WGq~$qCa^595Phn{
zyFE;|N5J)@!^I+0qR|7iTr}-j@pA@7Wk}dSn8<$t`6y?9fB*Z&e{0i2KiL_xv<cIY
za_XPkw~$V8qZUski9E}14xCL{P-jiCFP;(zAMR(`lJxJNo}Q{e)0E5+cw#=m(=6#e
zon1iNfA{-l9p}Kz^ibb^Be!fUHKCgK9P$U|Y6|XtlloY@^$N8Mx^uX<7ddL;3WW9P
zDL}@kD-<@$V*^>U6586>FuVj-_JXEt%?vj!Ll|o+@Knp^o;yKHJ$UD{v+Ja2M)<gd
zDBOp+mEi|v<>8Z5DTTmYfj)QtFF}!<e8Wh{>tZW>qvKFivMM|L_hu)mIjNh{M&KaQ
zyYD>G%H>TwP7*5mf-$M5*%rxqvHk%bFY>iogF@^mn5#y!qMEx8E1W(FgUqKZ5F-+e
zthR^9=x3*FJ%Te?A)n{jT4JYjLvWlYYEw_XhJ_Zak5*tHG(`49XLQS42nH>11FS|!
z*o5>~T7>v+=J!36WDe()FZwIo7xRzw9%4%W)&6B>W&aG<{ZSDr!hCyjEy>Lvsa~hX
z9q*%FYuM_m5!y7$7z<Z0dZtwZsgTYjYus0?Fz2>a=(<xb(X&EXI@{fCS~Bk5C$iPG
z8d@mQuE!bZ`v5agXLe+hmAsYxVNeNqIPF1#y9`k)vY#A+;XJe^5i)l~_!o=vp6YGq
zi@99P@YP^dDIoLAHmIxXBMdtJ4xZ-b<~I0uaVs4i9lGKk?rjj#{IzfJ`RYN+HDPur
zaJTlL_s3>L?ypU~O~g2HM^#~IvN{N7+&`V2I%05QmSb5O`s{+Lc~@r^CCL?$XxXky
zrdt&J1W+_u!zs5MTu!ZEQXZlU_*?=IuHi|Ra;oc%K0)FpAc>1An}D1^j~xIgh<7D8
zqaYI^)23M^pmWYo%>nB9{j6&=B?XQsw+_a_ra?hWuF!yiD{ThB*XdBm+vDV{e+##5
zxH780C{$AqnU{giFwP6Jc@L4tjwS>t-hh-Xw!D8WF#R3>KpEk}Tii7%1d6o8!-h<Y
z=k>-AiXx`cNf7+|D>*H02d<z`@6Hbs^?~niWa2*VZ9!u`L@(Z+jAlbs4Zl-7h%1Eg
z<X+z{<z=H(5&HMF3Mn)tkTFHLVlX+Ohm*??#IkmXp^OW`4aR$V6O;lUXp&>CKXCb%
z%x=~~sVd-pB72!_S-5CS7ZEqrwSx2<f=&RzNO{|s#et`1iw2dPJ*XDYZecfg!<Y@0
zH(;4Hk#;DZ{)QBfgn2w&svU6u+Bi2Xhjq%D|H`o)Hw?p}hnkSZ7}0%Yl0kDITy!ek
zn*C+mHKEtPV?_1gIvJPOwG$;{eGwk~A>0F|2hjdF_V)HhvWt%rz~~F%ceAAmBKgAp
zZS#Sd#9F*wqp-Ou*+qfh2(^^Imc~-GHnof5%Ef(6z2KXqza&XDKasfmN|lZfFFHx!
zDu@Xp=NV48hDttT%2V67`xT428^}<{(fjQMRx69_iHh9ge8V4hkZh3iz19juu0)P4
zHAIG)@z70GBfin4vwbqV7=YScvV)YU=$@cPX%YP&@lL(a5TA8QzmOzJf5@emW~S?<
zvVAX>nn41UG-ou#*pf3f9I7THa#I;C5lU3R<AgUZT4IHV2L!?q{Ko<mSgSlqz!QRA
zlYPcAnBiYt{|gQui`QJ%Fb=-qEwx2<_Uut#*0!fc9i<v7|FQhRm^#wxJNkZ7qgI|P
zChr|-awKx&Wo;#@AX_J9XIXHl!Yz%LksUEaE*|0Wz>+&R_ow4#0AvFDJ`9TYMJCzz
z{!D0Nb{5m)Xhwh~t8l0%SXqiGu_Tiwig}9UbV|;3SnfeEpDr4KREsFUzHtiA)e3IX
z-1LO*vm0OHt`oY5%<}6lG4!){xQ<~eiU}7;MF|n@sM~TXKU7IcX|EL=bVL_9sE;kl
z8Jb3udNiBCtb6xx=K_N!!^kW?M1z(xiS)tCX?6V@iHa4dJxm7H!Ie}HIc@^XOv5<O
znOiht1ec4#GqJ~eQ1Q8M?vGXF*-+{(!zFdGPJ^`A92|qqZ=;oxlBCUtm<K@UigA(`
zQLqbI?<0XpvOw>)o-5N2=ngf2?RR$ixk#gE;)$HU=60oA8QYbjLFp|hjFU|+h%DWR
z!eA4x`r9s~1R<#5b)J<qID)1ar<OAZE~IpT06Jx&{<=BsL7Vncpo^bCoYnuYA}fss
z{M3{@TBeNEKRNCWN)(d(HeCyL!b8L$0KGb&EY|4WH#arS4-O234c?5zqHwov^o1zP
zF~#FoQ__^lwtp{ju2j|t!$82s=o<aimk#DA8D`j;iN18QbYP166%|w>n?5~u?Ny4n
zv0fKhH<<-A_)tyUkc^Udr5gvrgg^)%wIYY%dq#s$J!uu}I`S01EZIQ8)nD}X^%iPI
z$jqJR0eW1`_wW3%ukXwx-a&;hDCB1_X}Ga_JO6sx6D^q}yrQGFN;Jw=Ovic{OMWEq
zm$44gVpmtFzGN8WlpVjMIe-b++D3G)KaCc<xc6-|daCD@O;ATJ`<y0?*s>?tFB8kY
zeOo|-NR!+<zA7NwK91?+Zof(`BKCq>>A0yu-Z*U3AeO!XTXkS5VX%3T?bGbA-sYHu
z+jBGKmQuf$0TpBfN_(!-X|$No+|+Z}D*6!(#nF#kEbbV_u`HQGkuZ7@LSVXy_O;6b
zowARJ><sO_wL7qUeUX$=HZ0SErso#7ii4eron)AgdrZ*!?t<x3V8~dysHEk}hN?rj
zoNSyR9s6UV^2M9oYLhh&Xuue`OyUTQgf++tOaYEsX|z;vmXaDI*wphdDr$(Q&KYZ4
zTx{D6N>M7qFPh%<Ylb=_#Xu1V<bo|jIreG0G=)QC6_$Xz1rJHB3Y-R7k}J(~_OyYQ
z@H2v4mvpvQD(Nrg=j$7u;q2C0FKvrwyr6RL7W3IbG9}{kfZG1#dT!{lRkRR7`?;Mn
z&BYx0U>{G#e_&wv2l3Y$_P$~)%&k-zu$Z6Z{V-&L5En6C8e9<Rlze3dil;)I`O^<Q
z%<fe71CBI13!!e~x5z-je7qN+$qNrxPAyJ$h*0v&gYhQFca>vwn{5`pwEko-36_rL
z-xYy_#p1p8`I`J?WAHvPD$rUCy2C&4=dc2&;AfO%c~blgSJuqX5x(g5v}T#C<ds2I
z$k#5LASo=&?RU~~#M@yv7$DP3B>6`g_y)Fpcr60d#%9nHtCEC7e|F&e^JcEUCvq^9
zbdI~Iv@st~uKMmN6zVUVRU;1v?CP%ve3w)M$5v6Qp@m8(1Ct5}1sLO`r0}z<sNV-I
zLK~ML^(EvO!djekBLzX0UVq|wgvD=9!uED>z(&y%^-ral2CLI!_eZ|Gb^%WG%x?QD
z?b5o|C#M8i6(P51w`(Wp{4_2lOT+&i!DTqFTu=^iWK}!8wLt}N)Sy-Cpa-Oo6;)PN
z+Pps9>Vn9je1o(o%WEXuG|^;o#Ml5Ywf@glu_DGLyZV*p8g3+;I<j&YHLzX0g(yZX
z-gWfAqEve9V)Ffv(w1W<p=#AW)){vy-GHrIpF?}&FSpF0&AME*t@F2PTv25tgTq}s
zO^{6a#sMY|H4)eSZ}a`_-d5b3O~3rV&@qc;E=pS!wysZ(5$`z}5YxtQ9WHMcSjhI8
znh$o7?dk6Eci-M-qb??Ji8{JjiSn~IrWg-UrL}4n%l>f!R3}fI#yjUJk1+a1AaXl~
z5}lp<v-Rh7fGk1{{~Hps_unLw$`Lu@^AMig`(F#jwY0K`gEDWH(G!<qDg5tBp>y3V
zHZZ<%!NGG&Iz=iU;5Oe}=$J;%|1`V8Q*8kE-F^ACawtPSa@0}XEgWhjD+pcR_in{<
z6LA6V^Nge;iPP<Cs!s49-f1HHi%rim1XI<{aE{M3VtpE4ZEMk1ZSlu7dHtJl0{AI$
z?}Rys9Y#?nJofd&2TiQKANMjhX-fh#dAcdv`a$1tWtkWlp3bI=BnIDF<pQZR6@J4H
zW29@E`8pT1#T*oVUqNa?jSBLWrtvyOQmg7CV?aSKhO!*MJHY<TomE)70v-5u9ZguD
zA3LR3!ZM}3-0ODX%a@j>rnK!JG74YR$x05tA5v;i!G6^3@_Quebe`*yE{UL2Pc9ua
znCuj790kYHdbL!3k}JiS)Z;-Sp-G~R+UKLtf7;~=W$k#nHV@r?EHHyzj=4pJfF;%$
z>pHGT?_RRn{yfvpkgPN3h#i_C0_BcC_si8-U5Mpq8<;bhB%232YSe*Jgcob;Mq0Z5
z^}LIIvFc#MM;%Scp1T(!;Tv?UWYMZ+8CIH_QuL55n6(<;6r(!KF(r5%v0_&{kZj1&
z@OX*~+#kVhOevXxKZzo5{1!1uV)AL2R=q=>N`6>q1NiPW+*#>FDE#U7>T%2v_yUr;
zP+>Ks`c-^h*9p+8N&3ZQ3Pruk8+p`>yGRY?Cp9%S=d*(MmjixIFDy&i<+k=moEiOp
zPcOgq{6f_i1q1KB^z@>p$x1e)DD_a*QMFYoBx|U&Z|Frk#+tRB<@B{8pHRx{h{6`b
zD?*NEen0hWSUQIIN{34kNVi;E^rLl$6?chdiLC#4m2zA1r(h3;;}DyT!C`z;)7AA|
zsq$Qo6(uCskw6Ta#L6|AL0L63G4{#<51IS23~!j3Zr5$<fy)+<=rVqKT%vn<z8Pu%
zZSVajew(YQ%`9m>5eYTFN_qVPagTc+p5Ok{b;$%f3W6lMdAUBwFoa=<-%X;LNoHZ$
z-Mld6C9$6}kG~&S(+SLgT#=u8Cd(Zo40j`CE`2<ESrw1}iL2~qcSaO;fr(LMf<~Yu
zuP}6Y8bEyXH1q>3-O%S$*%zZi*QJ{m4xicNI|rX?4&EKel%r!#r)0(|ba*j8xOmU!
zVXIrZcW95Nw<m4dQFn))H1Oq81i&AQ9UL*jZq9!mr-qed5IeIN4awYmlZwsfA&jSB
zGxZYvMmVmyXbrvH|EoR;yC?|bXyd5Xsd)xARNY<mZS{i|Cw)iEm$q1d-#Go}zirG)
zO?FzEmae-6F4CY%h)nW&jau7`dP8vDbkGe=oMOOMzp@jU$|UfaA!b92#zrZgA*wv)
z13emZ&yh;KZRJMVi(Z@l_d+r^kJiVdLz$8)CJ$x_s*F410CyJn1Bk>b9qxZR!?!DS
zC<w<eNfwh3=Pitj0z;5E*?XUGV)0l4irU%;(|5nEp@o*K8G0Tf!d#?m;hTiDh9l$E
zw)))u9SqXqLrY%z0<V3^V8z9uj1_gzV`oaiA$B+ZfR)Q_|6~F%p=6Y3Tr>fVJc?u(
zLK8cbp{Dk{3`_jJcPEBEnCZyaR-cjZ^S=l0bLUcFVM|5MP>drbZR36V^2IQR$8p0|
z>q-}KZrHS?9DBnEl;9LgsX=!+5RC=@FOL*wO+~!A)~${cVoYtc43wtxmW@y53M%MP
zDiD5k&M?n)`awkh+A03B1qTN45Sh3YRlZ9${3YK&D~$L&s@7z5M}7^zaA@-x`-4>Y
zomP=(Zwj@-+cD6Cfp_ky3YYaft6wno+^&)IVB<ETd1<^v#{2j(0XW<Q__1%P_$h>l
z#ZOYAoxKcA3^J9!tlE71qNWy*U^@U^`n<-VlW^~`+_<XmxGWLDadPBCc2CeT$A199
z^-)Y}%s?=4la-1GS7)_a+~w=U5K{IxXZ~y`zi5DqJbPTI3%C_zFTLEDwG|HZyr6-R
zRifa`XD{pOdeZ?I(f-~nE}!#5vqPdPOr*^j)guHPIE=s3c~!rE^9H`XJOTpp$3bop
zqoZ^8_JXjMf-+8RR5merYwM$XAk*@hA3M0>dm6IdqNUmik77oOptmN)Zn}2~GUJ_D
zUe?mk(t04{&P9>)BQd_$^)r5ox(Mf`(yhe5j4uhep5QSQdO9ptdED|79=!Vf3@!gl
zay=vYX6d^b%9eehtRpbKker+x1*`KY>#~WZ0kmc1d$<w~|D<I_{(u*+hF&A9Tw(tw
zlFo+d{6dvD>1oh&;$rVasLA%5vrAc7rZGJe)7QY0Wj4+^<mOf@O1*rcUpFU6ek5~v
zEcyKh@`6A|gfw>0B$wa)Z;h~U%MvR$BY0!O7srG$t^Pri&w3)Z{@?tI#KgqhnIx)k
z&;+E4M3KD=fQX9_ryou3Pk*=MnQI4J0n_Z~7f?qoUlrB_%Y~gc*PqfCa3$O$U{tPB
z@HTx19M>Z8VsLxk0v~ARE;m83D-$Py@^jpx(H%esTOPLwed1=a*^-hALk8$jByD!h
zT1orZ?N^(^fue3X*bilS-!VOn=jrQ1uL=YNdl}0UafP^Zf4<qRP`AW0`IXQ0dqHin
z3}8lZ7&cOorlIC;kkrwV0sz{fw7ZKMa7-%UeGY%<O@x3jnR}vhwl22&eSyx3lR0p%
zr+nEZ_=DNbJuv|IE;#^<<)cgjF<(NXKxxWmIVqXv#r>ZWwmEBOZC%dV^NxV$(-xJt
z{ai;)o90zs5yMo7NFmVM8W_*!$XuMC*Xw^2nt;80URz%weL0=SjdY6Tlc>>pEu~85
z1)$nz;9oC_3+m(|5*y5cqV&&jVu7KChDK;~cl5~R5!cSSlByROdbq71Jg8>^lte&4
zz;~7F*tIe_hJg5T>KOP8?^9bbi~TtmS`>HkI=aWgsg5wc^Jp^3A#P^LD|ce?t}gKP
zIJTmK&Sz&J`mxi?pWO$P@Q3N2584MPLVvvb^AhS><!(nW7!2$TXbdd|ayd3=vPu92
z^c^>1<s4}vZ*>A@C6!7h;cNKob1{?=KD(=PPADp}!Af3`*f!kEHr(GxJP5PiDnOmm
z;^E<)qj-Kp!mZYBw8&GhBu-Gun_0dQi$jlX6g1!Qgo(L89o&H<3d3_E=Qr@X99-(l
zYlS8NDq8pJgQ<7wyVC>c9@&l-h29NecNSj#5L8Zs3abvM*UKS95^Df^czQ$=dAaa!
z#nLS_1_qhS!Ore5XfbIu4$5BsgB49e%6{pI!D&!0+rc7=MG*nrgAWodMvpYHH$wI7
zJGTGy`Lq5%HU}##(~@&>t)z4FI6vPgtd(zZ=TXIa8M}?ZHgq0?O8UiYIDzCxdsAjT
z0D+<bVC)d4dLZoLGQF2hyWROc`c9W<{2w?ut=U2pb{#KH9R7o%NK&6RpohZ5R9TM~
z<m0BCFZhV3#c^OVA&4))f@z*Q{EXfld`OMi+^eK@RU#uJljy%4j`wEKphei9K=~SW
zb#+CS$)tS+;dcJPwv9Hd-i?;=q@(@!8GP0Rl_DyEaGRTvm*+qH+p)Vd;t#KcmTD=P
zs=mJet!MZ1dch}#1v;iZ8DkAj_*_6ksAR$FMiawYCC63Bx2ujBHo2xV1+aULrE2Z#
z{0WOxf?kRFg#~@R29rTXV37hA+jinWp9KQ9RH}s7U-&;#8e!TceYwoc7Dyxk@qMQe
zP%z+KX5F7BwWSJ~lK_059P8a4^bg<H237(boOj-D;C31qMpJiyX=}5iV7VFDvR02@
zeO|(iG{0aMVaz``4I|Wyj*h;PdG974p#fa+6u>YFQi5uQwp0Ox*cV{mb9wBRgOEP|
zW!tVo?Bl`05|`^k`>U6)TEAo!f*~6(N-C>!L?0vnvN9FGeF+e=U)g|IC*G`cx-Ql&
z7V)pk{EyR2062e#-z|=tXjvmztom6|h@uuem?BoC!qKX$_0tZV(4!EO7B-<29c^vx
zP~ZxDe*>cz@a_vk{L^oKJ>;x6*0LGkyOpXUywdD_y&pO;F_GCY6h~phH9mmOpK>Ab
z(NP4OtWC?E#wT8~rjP<(Jer!AVKkPQ&t>=GU*+3+T-#0qP~MwyjT#bQ026O+_c-PM
z>3+Nzs@viq<O49`?26+JUh&nKSi|z@U7P%zH(>G4f7MciLSlF&rO~-y<E!ST11Pv@
zY0KZ6tmmXRoQFwF0R~*g99TsH*YoOzmjOI2hI9-J4C_E#+ZOV@`})1Mwsv5E*~ej|
z@?CRuC<Bp8qg*H~bhVsXM@%Y9)@Jmca}g3nVFkdq`~YhA_2uQIs8}Yk3jjIgV4iP}
zc|hGfMn(-<5TMD-8+da#a|I+!d4d5i4=ccu6$LMjs-6Zcu9=Rkv<qC5H9G74FwX5*
zgz`c-YGZJvg{nf=Y!*UXmMR_a`&sGf>G=f(1@WxF*>8Zg5CGmoF*+{pBvfQBlXYQn
zQ4?4;@^8Rrvt9nrwVyOKGspzJ>M`B*dT2<{H&|oHeR6jhDZOTYT1GQ;){F5<pH_He
ziJ2kLn?`kO7)78*LjPC}n=LIXqXA&V55P^K+1=kSla!L8E;_^g@4x@p08?Yrso@p}
zAh>DH8cjNEo0xCd*iwl9u?tSQ5)ZQx4{H-dG-xqpa5t{lb-3)wyGlt(0m09D_V~6L
zSkY18Xk}$pT~kwI3vduLb{@`##Y6Xl=mX3F%@~^;r&+wl+Bx`V#<rg0qB-)vJW$~<
zUP};;806KR|5Q+LB0qYXeaoVA*G9aIdGokBmqg19Vb$P8G)_%fm-hR}c)1=K9z93U
zmj@-QIzWNh(l=3*hF%(CM4H1p(tP^eTI@gX3Aw0@WY)O$I;NSBh*ZCbI1gOCq4;BQ
zIRqVw8C>-V3V)WpeW#W)!OPF9Vk$mKlIs{nt|?RLGtmRdGi-FxqaR-L&$c|Vn^ayt
zU?sth1wSvcops5h5$K1FgM?t@=G7@Z?>RgR*JKaxqE^@Mfw%x<Nid$rs|(E@GV|<3
iV@VYKW1ygS_z&Rqj}hDU>%h_~kermVWUaVS$o~LNQ9up=

literal 0
HcmV?d00001

diff --git a/src/manifest.json b/src/manifest.json
index 24c208ca..48f7b32d 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -9,6 +9,11 @@
             "sizes": "144x144",
             "type": "image/png"
         },
+        {
+            "src": "/assets/192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
         {
             "src": "/assets/240x240.png",
             "sizes": "240x240",
@@ -37,5 +42,5 @@
           "text": "text",
           "url": "url"
         }
-    }      
+    }
 }

From af62094f1ff2eaed2c0cf76ef81d68584e6c6af2 Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Wed, 7 Aug 2019 22:10:33 +0800
Subject: [PATCH 13/21] feat: use probe to send img/video/file

---
 src/app/Services/FilesApiService.ts | 16 +-----
 src/app/Services/MessageService.ts  | 20 +++----
 src/app/Services/UploadService.ts   | 88 +++++++----------------------
 src/app/Views/talking.html          | 27 +++++----
 4 files changed, 45 insertions(+), 106 deletions(-)

diff --git a/src/app/Services/FilesApiService.ts b/src/app/Services/FilesApiService.ts
index 7f951310..c4572ad0 100644
--- a/src/app/Services/FilesApiService.ts
+++ b/src/app/Services/FilesApiService.ts
@@ -1,9 +1,9 @@
 import { ApiService } from './ApiService';
 import { Injectable } from '@angular/core';
-import { HttpRequest, HttpClient, HttpEventType, HttpEvent } from '@angular/common/http';
+import { HttpClient, HttpEvent, HttpEventType, HttpRequest } from '@angular/common/http';
 import { Observable } from 'rxjs/';
 import { UploadFile } from '../Models/UploadFile';
-import { map, catchError } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
 import { FilePath } from '../Models/FilePath';
 
 @Injectable()
@@ -15,18 +15,6 @@ export class FilesApiService {
         private http: HttpClient,
     ) {}
 
-    public UploadMedia(formData: FormData): Observable<number | UploadFile> {
-        const req = new HttpRequest('POST', `${ApiService.serverAddress + FilesApiService.serverPath}/UploadMedia`, formData, {
-            reportProgress: true,
-            withCredentials: true
-        });
-
-        return this.http.request(req).pipe(
-            map(event => this.getProgress(event)),
-            catchError(this.apiService.handleError)
-        );
-    }
-
     public UploadFile(formData: FormData, conversationID: number): Observable<number | UploadFile> {
         const req = new HttpRequest('POST', `${ApiService.serverAddress +
             FilesApiService.serverPath}/UploadFile?ConversationId=${conversationID}`, formData, {
diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts
index c2fb3e91..65df44d9 100644
--- a/src/app/Services/MessageService.ts
+++ b/src/app/Services/MessageService.ts
@@ -200,14 +200,12 @@ export class MessageService {
                         t.content = '';
                     }
                     t.contentRaw = t.content;
+                    console.log(t.contentRaw);
                     t.timeStamp = new Date(t.sendTime).getTime();
                     if (t.content.match(/^\[(video|img)\].*/)) {
-                        const fileKey = this.uploadService.getFileKey(t.content);
-                        if (fileKey === -1 || isNaN(fileKey)) {
-                            t.content = '';
-                        } else if (t.content.startsWith('[img]')) {
-                            let imageWidth = Number(t.content.split('-')[1]),
-                                imageHeight = Number(t.content.split('-')[2]);
+                        if (t.content.startsWith('[img]')) {
+                            let imageWidth = Number(t.content.split('|')[1]),
+                                imageHeight = Number(t.content.split('|')[2]);
                             const ratio = imageHeight / imageWidth;
                             const realMaxWidth = Math.min(this.maxImageWidth, Math.floor(900 / ratio));
 
@@ -215,14 +213,10 @@ export class MessageService {
                                 imageWidth = realMaxWidth;
                                 imageHeight = Math.floor(realMaxWidth * ratio);
                             }
-                            t.content = `[img]${Values.fileAddress}${t.content.substring(5).split('-')[0]}-${imageWidth}-${imageHeight}`;
+                            t.content = `[img]${Values.fileAddress}${t.content.substring(5).split('|')[0]}|${imageWidth}|${imageHeight}`;
+                            console.log('!!!!!!' + t.content);
                         }
-                    } else if (t.content.match(/^\[(file|audio)\].*/)) {
-                        const fileKey = this.uploadService.getFileKey(t.content);
-                        if (fileKey === -1 || isNaN(fileKey)) {
-                            t.content = '';
-                        }
-                    } else {
+                    } else if (!t.content.match(/^\[(file|audio)\].*/)) {
                         t.isEmoji = this.checkEmoji(t.content);
                         t.content = he.encode(t.content);
                         t.content = Autolinker.link(t.content, {
diff --git a/src/app/Services/UploadService.ts b/src/app/Services/UploadService.ts
index 75b016a9..564142db 100644
--- a/src/app/Services/UploadService.ts
+++ b/src/app/Services/UploadService.ts
@@ -33,26 +33,7 @@ export class UploadService {
             Swal.fire('Try again', 'Only support .png, .jpg, .jpeg, .svg, gif or .bmp file', 'error');
             return;
         }
-        if (fileType === 0 || fileType === 1) {
-            const alert = this.fireUploadingAlert(`Uploading your ${fileType === 0 ? 'Image' : 'Video'}...`);
-            const mission = this.filesApiService.UploadMedia(formData).subscribe(response => {
-                if (Number(response)) {
-                    this.updateAlertProgress(Number(response));
-                } else if (response) {
-                    // Done!
-                    Swal.close();
-                    this.encryptThenSend(response, fileType, conversationID, aesKey, file);
-                }
-            }, () => {
-                Swal.close();
-                Swal.fire('Error', 'Upload failed', 'error');
-            });
-            alert.then(result => {
-                if (result.dismiss) {
-                    mission.unsubscribe();
-                }
-            });
-        } else if (fileType === 3) {
+        if (fileType === 3) {
             const audioSrc = URL.createObjectURL(file);
             const audioHTMLString = `<audio controls src="${audioSrc}"></audio>`;
             Swal.fire({
@@ -72,7 +53,7 @@ export class UploadService {
                 URL.revokeObjectURL(audioSrc);
             });
         } else {
-            const alert = this.fireUploadingAlert('Uploading your file...');
+            const alert = this.fireUploadingAlert(`Uploading your ${fileType === 0 ? 'image' : (fileType === 1 ? 'video' : 'file')}...`);
             const mission = this.filesApiService.UploadFile(formData, conversationID).subscribe(response => {
                 if (Number(response)) {
                     this.updateAlertProgress(Number(response));
@@ -126,8 +107,8 @@ export class UploadService {
                                         [width, height] = [height, width];
                                     }
                                 }
-                                encedMessages = AES.encrypt(`[img]${(<UploadFile>response).filePath}-${width}-${
-                                    height}-${orientation}`, aesKey).toString();
+                                encedMessages = AES.encrypt(`[img]${(<UploadFile>response).filePath}|${width}|${
+                                    height}|${orientation}`, aesKey).toString();
                                 this.sendMessage(encedMessages, conversationID);
                             }.bind(this),
                             {meta: true}
@@ -138,7 +119,7 @@ export class UploadService {
                         this.sendMessage(encedMessages, conversationID);
                         break;
                     case 2:
-                        encedMessages = AES.encrypt(this.formatFileMessage(<UploadFile>response), aesKey).toString();
+                        encedMessages = AES.encrypt(this.formatFileMessage(<UploadFile>response, file.name), aesKey).toString();
                         this.sendMessage(encedMessages, conversationID);
                         break;
                     case 3:
@@ -248,60 +229,29 @@ export class UploadService {
         }
     }
 
-    public getFileKey(message: string): number {
-        if (message === null || message.length < 5) {
-            return -1;
-        }
-        if (message.startsWith('[img]')) {
-            return Number(message.substring(5, message.indexOf('-')));
-        } else if (message.startsWith('[file]')) {
-            return Number(message.substring(6, message.indexOf('-')));
-        } else if (message.startsWith('[video]') || message.startsWith('[audio]')) {
-            return Number(message.substring(7));
-        } else {
-            return -1;
-        }
-    }
-
     public getFileURL(event: MouseEvent, message: string): void {
         event.preventDefault();
-        const filekey = this.getFileKey(message);
-        if (filekey !== -1 && !isNaN(filekey) && filekey !== 0) {
-            this.filesApiService.GetFileURL(filekey).subscribe(response => {
-                if (response.code === 0) {
-                    const link = document.createElement('a');
-                    link.href = response.downloadPath;
-                    document.body.appendChild(link);
-                    link.click();
-                    document.body.removeChild(link);
-                }
-            });
-        }
+        const link = document.createElement('a');
+        link.href = message.substring(6).split('|')[0];
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
     }
 
     public getAudio(target: HTMLElement, message: string): void {
-        const filekey = this.getFileKey(message);
-        if (filekey !== -1 && !isNaN(filekey) && filekey !== 0) {
-            this.filesApiService.GetFileURL(filekey).subscribe(response => {
-                if (response.code === 0) {
-                    target.style.display = 'none';
-                    const audioElement = document.createElement('audio');
-                    audioElement.style.maxWidth = '100%';
-                    audioElement.src = response.downloadPath;
-                    audioElement.controls = true;
-                    target.parentElement.appendChild(audioElement);
-                    audioElement.play();
-                }
-            });
-        }
+        target.style.display = 'none';
+        const audioElement = document.createElement('audio');
+        audioElement.style.maxWidth = '100%';
+        audioElement.src = message.substring(7).split('|')[0];
+        audioElement.controls = true;
+        target.parentElement.appendChild(audioElement);
+        audioElement.play();
     }
 
-    private formatFileMessage(response: UploadFile): string {
-        let message = '[file]';
+    private formatFileMessage(response: UploadFile, fileName: string): string {
+        let message = `[file]${response.filePath}|${fileName}|`;
         const units = ['kB', 'MB', 'GB'];
         const thresh = 1000;
-        message += response.filePath + '-';
-        message += response.savedFileName.replace(/-/g, '') + '-';
         if (response.fileSize < thresh) {
             message += response.fileSize + ' B';
         } else {
diff --git a/src/app/Views/talking.html b/src/app/Views/talking.html
index 14cbb5c7..3cf6b6ec 100644
--- a/src/app/Views/talking.html
+++ b/src/app/Views/talking.html
@@ -18,16 +18,23 @@
                         <label class="badge badge-secondary"
                                *ngIf="message.sender.emailConfirmed && message.sender.email && message.sender.email.endsWith('@aiursoft.com')">Staff</label>
                     </span>
-                    <a *ngIf="message.content.startsWith('[img]') && message.content.split('-').length === 3" target="_blank" rel="noopener noreferrer" href="{{ message.content.substring(5).split('-')[0] }}">
-                        <div class="image-container" [style.width.px]="message.content.split('-')[1]" [style.height.px]="message.content.split('-')[2]">
-                            <img src="{{ message.content.substring(5).split('-')[0] }}"
-                                srcset="{{ message.content.substring(5).split('-')[0] }}?w={{ message.content.split('-')[1] }}&h={{ message.content.split('-')[2] }},
-                                {{ message.content.substring(5).split('-')[0] }}?w={{ Math.floor(message.content.split('-')[1] * 1.5) }}&h={{ Math.floor(message.content.split('-')[2] * 1.5) }} 1.5x,
-                                {{ message.content.substring(5).split('-')[0] }}?w={{ Math.floor(message.content.split('-')[1] * 2) }}&h={{ Math.floor(message.content.split('-')[2] * 2) }} 2x">
+                    <a *ngIf="message.content.startsWith('[img]') && message.content.split('|').length === 3"
+                       target="_blank" rel="noopener noreferrer"
+                       href="{{ message.content.substring(5).split('|')[0] }}">
+                        <div class="image-container" [style.width.px]="message.content.split('|')[1]"
+                             [style.height.px]="message.content.split('|')[2]">
+                            <img src="{{ message.content.substring(5).split('|')[0] }}"
+                                 srcset="{{ message.content.substring(5).split('|')[0] }}?w={{ message.content.split('|')[1] }}&h={{ message.content.split('|')[2] }},
+                                {{ message.content.substring(5).split('|')[0] }}?w={{ Math.floor(message.content.split('|')[1] * 1.5) }}&h={{ Math.floor(message.content.split('|')[2] * 1.5) }} 1.5x,
+                                {{ message.content.substring(5).split('|')[0] }}?w={{ Math.floor(message.content.split('|')[1] * 2) }}&h={{ Math.floor(message.content.split('|')[2] * 2) }} 2x">
                         </div>
                     </a>
-                    <a class="file" *ngIf="message.content.startsWith('[file]') && message.content.split('-').length == 3"  target="_blank" rel="noopener noreferrer" href="" (click)="uploadService.getFileURL($event, message.content)">
-                        <div [ngSwitch]="message.content.split('-')[1].substring(message.content.split('-')[1].indexOf('.') + 1)">
+                    <a class="file"
+                       *ngIf="message.content.startsWith('[file]') && message.content.split('|').length == 3"
+                       target="_blank" rel="noopener noreferrer" href=""
+                       (click)="uploadService.getFileURL($event, message.content)">
+                        <div
+                            [ngSwitch]="message.content.split('|')[1].substring(message.content.split('|')[1].indexOf('.') + 1)">
                             <i *ngSwitchCase="'pdf'" class="fa fa-file-pdf-o" aria-hidden="true"></i>
                             <i *ngSwitchCase="'jpg'" class="fa fa-file-image-o" aria-hidden="true"></i>
                             <i *ngSwitchCase="'png'" class="fa fa-file-image-o" aria-hidden="true"></i>
@@ -60,8 +67,8 @@
                             <i *ngSwitchCase="'key'" class="fa fa-file-powerpoint-o" aria-hidden="true"></i>
                             <i *ngSwitchDefault class="fa fa-file" aria-hidden="true"></i>
                         </div>
-                        <h5>{{message.content.split('-')[1]}}</h5>
-                        <span>{{message.content.split('-')[2]}}</span>
+                        <h5>{{message.content.split('|')[1]}}</h5>
+                        <span>{{message.content.split('|')[2]}}</span>
                     </a>
                     <div *ngIf="message.content.startsWith('[video]')" >
                         <video src="{{ fileAddress + message.content.substring(7) }}" controls muted></video>

From 7b6e87f4545b783053342af2ab148c69c09f199b Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Wed, 7 Aug 2019 22:16:30 +0800
Subject: [PATCH 14/21] fix file download address & remove debug code

---
 src/app/Services/MessageService.ts | 2 --
 src/app/Services/UploadService.ts  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts
index 65df44d9..2f872537 100644
--- a/src/app/Services/MessageService.ts
+++ b/src/app/Services/MessageService.ts
@@ -200,7 +200,6 @@ export class MessageService {
                         t.content = '';
                     }
                     t.contentRaw = t.content;
-                    console.log(t.contentRaw);
                     t.timeStamp = new Date(t.sendTime).getTime();
                     if (t.content.match(/^\[(video|img)\].*/)) {
                         if (t.content.startsWith('[img]')) {
@@ -214,7 +213,6 @@ export class MessageService {
                                 imageHeight = Math.floor(realMaxWidth * ratio);
                             }
                             t.content = `[img]${Values.fileAddress}${t.content.substring(5).split('|')[0]}|${imageWidth}|${imageHeight}`;
-                            console.log('!!!!!!' + t.content);
                         }
                     } else if (!t.content.match(/^\[(file|audio)\].*/)) {
                         t.isEmoji = this.checkEmoji(t.content);
diff --git a/src/app/Services/UploadService.ts b/src/app/Services/UploadService.ts
index 564142db..ec055e3e 100644
--- a/src/app/Services/UploadService.ts
+++ b/src/app/Services/UploadService.ts
@@ -232,7 +232,7 @@ export class UploadService {
     public getFileURL(event: MouseEvent, message: string): void {
         event.preventDefault();
         const link = document.createElement('a');
-        link.href = message.substring(6).split('|')[0];
+        link.href = Values.fileAddress + message.substring(6).split('|')[0];
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);
@@ -242,7 +242,7 @@ export class UploadService {
         target.style.display = 'none';
         const audioElement = document.createElement('audio');
         audioElement.style.maxWidth = '100%';
-        audioElement.src = message.substring(7).split('|')[0];
+        audioElement.src = Values.fileAddress + message.substring(7).split('|')[0];
         audioElement.controls = true;
         target.parentElement.appendChild(audioElement);
         audioElement.play();

From 97a321250156de5b4c401fb8e90cbb5cef7a0fc8 Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Wed, 7 Aug 2019 22:19:16 +0800
Subject: [PATCH 15/21] remove useless code

---
 src/app/Models/FilePath.ts          | 6 ------
 src/app/Models/UploadFile.ts        | 2 --
 src/app/Services/FilesApiService.ts | 5 -----
 3 files changed, 13 deletions(-)
 delete mode 100644 src/app/Models/FilePath.ts

diff --git a/src/app/Models/FilePath.ts b/src/app/Models/FilePath.ts
deleted file mode 100644
index 31a594ab..00000000
--- a/src/app/Models/FilePath.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { AiurProtocal } from './AiurProtocal';
-
-export class FilePath extends AiurProtocal {
-    public fileName: string;
-    public downloadPath: string;
-}
diff --git a/src/app/Models/UploadFile.ts b/src/app/Models/UploadFile.ts
index 85051452..9cd1755b 100644
--- a/src/app/Models/UploadFile.ts
+++ b/src/app/Models/UploadFile.ts
@@ -1,8 +1,6 @@
 import { AiurProtocal } from './AiurProtocal';
 
 export class UploadFile extends AiurProtocal {
-    public savedFileName: string;
     public filePath: string;
     public fileSize: number;
-    public downloadPath: string;
 }
diff --git a/src/app/Services/FilesApiService.ts b/src/app/Services/FilesApiService.ts
index c4572ad0..434515aa 100644
--- a/src/app/Services/FilesApiService.ts
+++ b/src/app/Services/FilesApiService.ts
@@ -4,7 +4,6 @@ import { HttpClient, HttpEvent, HttpEventType, HttpRequest } from '@angular/comm
 import { Observable } from 'rxjs/';
 import { UploadFile } from '../Models/UploadFile';
 import { catchError, map } from 'rxjs/operators';
-import { FilePath } from '../Models/FilePath';
 
 @Injectable()
 export class FilesApiService {
@@ -39,10 +38,6 @@ export class FilesApiService {
         }
     }
 
-    public GetFileURL(fileKey: number): Observable<FilePath> {
-        return this.apiService.Post(FilesApiService.serverPath + '/FileDownloadAddress', {FileKey: fileKey});
-    }
-
     public UploadIcon(formData: FormData): Observable<number | UploadFile> {
         const req = new HttpRequest('POST', `${ApiService.serverAddress + FilesApiService.serverPath}/UploadIcon`, formData, {
             reportProgress: true,

From c2966ab4eab1e6b49b11ea0868f79608b281b99d Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Wed, 7 Aug 2019 22:21:53 +0800
Subject: [PATCH 16/21] fix: change load image close #615

---
 src/app/values.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/values.ts b/src/app/values.ts
index d9bba04d..621ef199 100644
--- a/src/app/values.ts
+++ b/src/app/values.ts
@@ -1,5 +1,5 @@
 export class Values {
     public static fileAddress = 'https://probe.aiursoft.com/Download/InSites/';
-    public static loadingImgURL = 'https://cdn.aiursoft.com/images/loading.gif';
+    public static loadingImgURL = 'https://ui.cdn.aiursoft.com/images/loading.gif';
     public static sourceCodeURL = 'https://github.com/AiursoftWeb/Kahla.App/commit/';
 }

From 7e7cea67182820f8393103c24c801fe2cf797d4d Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Thu, 8 Aug 2019 15:37:13 +0800
Subject: [PATCH 17/21] fix: urlencode probe url

---
 src/app/Services/MessageService.ts | 4 +++-
 src/app/Services/UploadService.ts  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts
index 2f872537..3c09c19c 100644
--- a/src/app/Services/MessageService.ts
+++ b/src/app/Services/MessageService.ts
@@ -212,7 +212,9 @@ export class MessageService {
                                 imageWidth = realMaxWidth;
                                 imageHeight = Math.floor(realMaxWidth * ratio);
                             }
-                            t.content = `[img]${Values.fileAddress}${t.content.substring(5).split('|')[0]}|${imageWidth}|${imageHeight}`;
+                            t.content =
+                                `[img]${Values.fileAddress}${encodeURIComponent(t.content.substring(5).split('|')[0])
+                                    .replace(/%2F/g, '/')}|${imageWidth}|${imageHeight}`;
                         }
                     } else if (!t.content.match(/^\[(file|audio)\].*/)) {
                         t.isEmoji = this.checkEmoji(t.content);
diff --git a/src/app/Services/UploadService.ts b/src/app/Services/UploadService.ts
index ec055e3e..bfbb6b6b 100644
--- a/src/app/Services/UploadService.ts
+++ b/src/app/Services/UploadService.ts
@@ -232,7 +232,7 @@ export class UploadService {
     public getFileURL(event: MouseEvent, message: string): void {
         event.preventDefault();
         const link = document.createElement('a');
-        link.href = Values.fileAddress + message.substring(6).split('|')[0];
+        link.href = Values.fileAddress + encodeURIComponent(message.substring(6).split('|')[0]).replace(/%2F/g, '/');
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);
@@ -242,7 +242,7 @@ export class UploadService {
         target.style.display = 'none';
         const audioElement = document.createElement('audio');
         audioElement.style.maxWidth = '100%';
-        audioElement.src = Values.fileAddress + message.substring(7).split('|')[0];
+        audioElement.src = Values.fileAddress + encodeURIComponent(message.substring(7).split('|')[0]).replace(/%2F/g, '/');
         audioElement.controls = true;
         target.parentElement.appendChild(audioElement);
         audioElement.play();

From 39add41e79da8fb55749a36bca917a1054c6bffc Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Thu, 8 Aug 2019 17:47:50 +0800
Subject: [PATCH 18/21] fix: better file name for clipboard and audio

---
 src/app/Controllers/talking.component.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/Controllers/talking.component.ts b/src/app/Controllers/talking.component.ts
index 97776beb..9b71cf8e 100644
--- a/src/app/Controllers/talking.component.ts
+++ b/src/app/Controllers/talking.component.ts
@@ -296,7 +296,9 @@ export class TalkingComponent implements OnInit, OnDestroy {
         for (let i = 0; i < items.length; i++) {
             if (items[i].kind === 'file') {
                 this.preventDefault(event);
-                const blob = items[i].getAsFile();
+                const originalFile = items[i].getAsFile();
+                const blob = new File([originalFile],
+                    `clipboardImg_${new Date().getTime()}.${originalFile.name.substring(originalFile.name.lastIndexOf('.') + 1)}`);
                 if (blob != null) {
                     const urlString = URL.createObjectURL(blob);
                     Swal.fire({
@@ -365,7 +367,7 @@ export class TalkingComponent implements OnInit, OnDestroy {
                     });
                     this.mediaRecorder.addEventListener('stop', () => {
                         this.recording = false;
-                        const audioBlob = new File(audioChunks, 'audio');
+                        const audioBlob = new File(audioChunks, `voiceMsg_${new Date().getTime()}.opus`);
                         this.uploadService.upload(audioBlob, this.conversationID, this.messageService.conversation.aesKey, 3);
                         clearTimeout(this.forceStopTimeout);
                         stream.getTracks().forEach(track => track.stop());

From 576e96d5b5d5bf328fdeba527383754517757033 Mon Sep 17 00:00:00 2001
From: Anduin2017 <anduin@aiursoft.com>
Date: Thu, 8 Aug 2019 18:12:25 +0800
Subject: [PATCH 19/21] Allow group with space.

---
 src/app/Controllers/friends.component.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/Controllers/friends.component.ts b/src/app/Controllers/friends.component.ts
index e03f7582..b77bf439 100644
--- a/src/app/Controllers/friends.component.ts
+++ b/src/app/Controllers/friends.component.ts
@@ -48,10 +48,6 @@ export class FriendsComponent implements OnInit {
             showCancelButton: true,
         }).then(input => {
             if (input.value) {
-                if (input.value.includes(' ')) {
-                    Swal.fire('Try again', 'Group name can\'t contain whitespaces.', 'error');
-                    return;
-                }
                 if (input.value.length < 3 || input.value.length > 25) {
                     Swal.fire('Try again', 'Group name length must between three and twenty five.', 'error');
                     return;

From 245314bef2f025d7c8e10c9322a2e70e2859e881 Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Thu, 8 Aug 2019 18:41:33 +0800
Subject: [PATCH 20/21] fix: prevent blocking items when using ios safari

---
 src/app/Controllers/app.component.ts | 10 +++++++++-
 src/app/Views/app.html               |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/app/Controllers/app.component.ts b/src/app/Controllers/app.component.ts
index a48d1737..fd3a842a 100644
--- a/src/app/Controllers/app.component.ts
+++ b/src/app/Controllers/app.component.ts
@@ -16,6 +16,8 @@ import { MessageService } from '../Services/MessageService';
 
 export class AppComponent implements OnInit, AfterViewInit {
 
+    public iosHeightFix = false;
+
     constructor(
         private initService: InitService,
         private elementRef: ElementRef,
@@ -31,6 +33,13 @@ export class AppComponent implements OnInit, AfterViewInit {
         Swal.close();
     }
 
+    @HostListener('window:resize')
+    onResize() {
+        // in safari and the address bar is shown...
+        this.iosHeightFix = window.navigator.platform && /iP(ad|hone|od)/.test(window.navigator.platform) &&
+            document.body.scrollHeight - window.innerHeight >= 50;
+    }
+
     @HostListener('window:load', [])
     onLoad() {
         if ('Notification' in window && 'serviceWorker' in navigator) {
@@ -65,7 +74,6 @@ export class AppComponent implements OnInit, AfterViewInit {
         // disable body scroll for ios
         if (window.navigator.platform && /iP(ad|hone|od)/.test(window.navigator.platform)) {
             this.homeService.updateIosDisableScroll();
-
             new MutationObserver(() => {
                 this.homeService.updateIosDisableScroll();
             })
diff --git a/src/app/Views/app.html b/src/app/Views/app.html
index 802a4a70..025e6d2d 100644
--- a/src/app/Views/app.html
+++ b/src/app/Views/app.html
@@ -5,7 +5,9 @@
 </div>
 <div id="contentWrapper" class="content-wrapper" *ngIf="!(route.isActive('/home', false) && homeService.wideScreenEnabled)"
      [class.in-widescreen]="homeService.wideScreenEnabled">
+    <div style="height: 50px" *ngIf="iosHeightFix"></div>
     <router-outlet></router-outlet>
+    <div style="height: 50px" *ngIf="iosHeightFix"></div>
 </div>
 <!-- Show an empty component when no reasonable component to show. -->
 <div class="content-empty" *ngIf="route.isActive('/home', false) && homeService.wideScreenEnabled && messageService.me">

From 032a14b20597f6a5d60c3b436b25b8689f78a4f0 Mon Sep 17 00:00:00 2001
From: EdgeNeko <EdgeNeko@aiursoft.com>
Date: Fri, 9 Aug 2019 14:53:49 +0800
Subject: [PATCH 21/21] fix: update conversations and friends when reconnect

---
 src/app/Services/InitService.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts
index aead3602..26d266be 100644
--- a/src/app/Services/InitService.ts
+++ b/src/app/Services/InitService.ts
@@ -97,6 +97,10 @@ export class InitService {
             this.ws.onerror = () => this.errorOrClosedFunc();
             this.ws.onclose = () => this.errorOrClosedFunc();
             this.resend();
+            if (reconnect) {
+                this.cacheService.updateConversation();
+                this.cacheService.updateFriends();
+            }
             if (this.messageService.conversation && reconnect) {
                 this.messageService.getMessages(0, this.messageService.conversation.id, -1, 15);
             }