Merge pull request #86 from CECS-478-AuRave/androidDeploy

Deployment Ready App

Author: kuminin

client/secureChatIonic/app/pages/all-conversations/all-conversations.html

@@ -10,7 +10,7 @@
     <button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
-    <ion-title>Messages</ion-title>
+    <ion-title class="animated fadeIn">Messages</ion-title>
   </ion-navbar>
 </ion-header>
 
@@ -22,13 +22,13 @@
 
     <!-- If no Messages found -->
     <div *ngIf="!hasConversations()">
-      <h2 class="centerText">No Conversations Found!</h2>
-      <h6 class="centerText">Add some friends using the side menu</h6>
+      <h2 class="centerText animated fadeIn">No Conversations Found!</h2>
+      <h6 class="centerText animated fadeInLeft">Add some friends using the side menu</h6>
     </div>
 
     <!-- If we have messages -->
     <div *ngIf="hasConversations()">
-      <button ion-item class="messageItem" *ngFor="let conversation of convoList" (click)="convoClick(conversation)">
+      <button ion-item class="messageItem animated fadeInUp" *ngFor="let conversation of convoList" (click)="convoClick(conversation)">
           <!-- Our user name -->
           <h3 class="messageUser">{{getConvoMembers(conversation)}}</h3>
           <!-- Our message text -->
@@ -40,6 +40,6 @@ <h3 class="messageUser">{{getConvoMembers(conversation)}}</h3>
 </ion-content>
 
 <!-- Add friend fab -->
-<ion-fab class="plusFab" (click)="goToNewConversation()">
+<ion-fab class="plusFab animated fadeInRight" (click)="goToNewConversation()">
   <button ion-fab color="primary"><ion-icon name="add"></ion-icon></button>
 </ion-fab>

client/secureChatIonic/app/pages/all-conversations/all-conversations.ts

@@ -67,10 +67,6 @@ export class AllConversationsPage {
 
     this.pollingRequest = poll.subscribe(function(success) {
 
-      //Dont do anything on no changes
-      if(success.status == 304) return;
-
-
       //Success!
       self.messageGetSuccess(success);
     }, function(error) {
@@ -138,7 +134,7 @@ export class AllConversationsPage {
     let userId = JSON.parse(localStorage.getItem(AppSettings.shushItemName))._id;
 
     //Filter our convo
-    convo = this.appMessaging.filterConvoMessages(convo);
+    convo = this.appMessaging.filterConvoMessages(convo, false);
 
     //Get the last message sender, since it is filter we can assume the zero index
     let lastMessage = convo.messages[convo.messages.length - 1].message[0];

client/secureChatIonic/app/pages/auth-login/auth-login.html

@@ -9,7 +9,7 @@
     <button menuToggle>
         <ion-icon name="menu"></ion-icon>
       </button>
-    <ion-title>Login</ion-title>
+    <ion-title class="animated fadeIn">Login</ion-title>
   </ion-navbar>
 </ion-header>
 
@@ -20,7 +20,7 @@
   <h3 class="centerText loginHeader">Shush uses Facebook to help you discretely connect and talk to your friends.</h3>
 
   <!-- Facebook login button -->
-  <div class="centerText" (click)='login()'>
+  <div class="centerText animated fadeInUp" (click)='login()'>
     <img class="fbLogin" src="build/images/facebookLoginButton.png">
   </div>
 </ion-content>

client/secureChatIonic/app/pages/conversation/conversation.html

@@ -7,7 +7,7 @@
 <ion-header>
 
   <ion-navbar>
-    <ion-title class="navTitle">
+    <ion-title class="navTitle animated fadeIn">
       {{convoTitle}}
     </ion-title>
     <!-- Show a loading symbol when decrypting -->
@@ -21,14 +21,15 @@
 
   <!-- Ngfor our messages -->
   <!-- We are assuming a filtered convo -->
-  <ion-card *ngFor="let convoMessage of convo.messages; let i = index;" [ngClass]="{'sender': !convoMessage.message[0].isUser, 'user': convoMessage.message[0].isUser}">
+  <ion-card *ngFor="let convoMessage of convo.messages; let i = index;"
+      [ngClass]="{}">
     <!--
         For media messages if supported
         <img src="img/nin-live.png" />
     -->
 
     <!-- User who sent the item -->
-    <ion-item>
+    <ion-item class="animated fadeIn">
       <ion-avatar item-left>
         <img src="https://{{convoMessage.message[0].from.profilePhotoURL}}">
       </ion-avatar>

client/secureChatIonic/app/pages/conversation/conversation.ts

@@ -56,7 +56,7 @@ export class ConversationPage {
     //Get the conversation passed from the last page
     let passedConvo = this.navParams.get('conversation');
     //Filter the conversations
-    this.convo = this.appMessaging.filterConvoMessages(passedConvo);
+    this.convo = this.appMessaging.filterConvoMessages(passedConvo, false);
     //Start Decypting the messages
     this.decryptConvo();
 
@@ -96,34 +96,22 @@ export class ConversationPage {
     this.pollingRequest = poll.subscribe(function(success) {
       //Success!
 
-      //Stop loading
-      self.appNotify.stopLoading().then(function() {
+      //Add our messages/Get our conversation
+      self.appMessaging.conversations = success;
 
-        //Dont do anything on no changes
-        if(success.status == 304) return;
-
-        //Add our messages/Get our conversation
-        self.appMessaging.conversations = success;
-
-        //Update our conversations
-        self.updateConversation();
-      });
+      //Update our conversations
+      self.updateConversation();
     }, function(error) {
       //Error!
-
-      //Stop Loading
-      self.appNotify.stopLoading().then(function() {
-        //Pass to Error Handler
-        self.appNotify.handleError(error, [{
-          status: 404,
-          callback: function() {
-            //Pop back to the All conversations view
-
-            self.navCtrl.pop();
-          }
-        }]);
-      });
-
+      //Pass to Error Handler
+      self.appNotify.handleError(error, [{
+        status: 404,
+        callback: function() {
+          //Pop back to the All conversations view
+
+          self.navCtrl.pop();
+        }
+      }]);
     }, function() {
       //Completed
     })
@@ -134,10 +122,10 @@ export class ConversationPage {
 
     //Find and update our current conversation
     for (let i = 0; i < this.appMessaging.conversations.length; ++i) {
-      if (this.convoId == this.appMessaging.conversations[i]._id) {
+      if (this.convoId == this.appMessaging.conversations[i].conversationID) {
 
         //Update/Filter the conversations
-        this.convo = this.appMessaging.filterConvoMessages(this.appMessaging.conversations[i]);
+        this.convo = this.appMessaging.filterConvoMessages(this.appMessaging.conversations[i], this.convo);
         //Start Decypting the messages
         this.decryptConvo();
 
@@ -191,6 +179,25 @@ export class ConversationPage {
     let decryptRequest = new Observable(function(decrytReturn) {
       for(let i = 0; i < self.convo.messages.length; i++) {
         //Decrypt the message
+        //Check if we have already decrypted
+        if(self.convo.messages[i].message[0].decryptedMessage) {
+          //Add to the decrypt cache
+          decryptCache.push(i);
+
+          //Check if we should unsubscribe
+          if(decryptCache.length == self.convo.messages.length) {
+              //Reset everything
+              self.decryptingObservable.unsubscribe();
+              self.decryptingObservable = false;
+              decryptCache = [];
+          }
+
+          //Update the UI
+          setTimeout(function() {
+            self.changeDetector.detectChanges();
+          }, 250);
+        }
+
         //The identifier will be the index of the convo messages message
         self.appCrypto.decryptMessage(self.convo.messages[i].message[0].message.messageText,
             self.convo.messages[i].message[0].message.messageHmac,
@@ -215,6 +222,15 @@ export class ConversationPage {
               setTimeout(function() {
                 self.changeDetector.detectChanges();
               }, 250);
+            }, function(error) {
+              if(self.decryptingObservable) self.decryptingObservable.unsubscribe();
+              self.decryptingObservable = false;
+              decryptCache = [];
+
+              self.appNotify.showToast('Could not decrypt messages. You should ask other group members to store the conversation, or delete it.');
+
+              //Go back to the all conversations page
+              self.navCtrl.pop();
             });
       }
     });
@@ -309,7 +325,7 @@ export class ConversationPage {
 
           //Set our convo to the the filtered success result
           //Update/Filter the conversations
-          self.convo = self.appMessaging.filterConvoMessages(success);
+          self.convo = self.appMessaging.filterConvoMessages(success, self.convo);
           //Start Decypting the messages
           self.decryptConvo();
 

client/secureChatIonic/app/pages/friends-list/friends-list.html

@@ -10,7 +10,7 @@
     <button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
-    <ion-title>Friends</ion-title>
+    <ion-title class="animated fadeIn">Friends</ion-title>
   </ion-navbar>
 </ion-header>
 
@@ -25,12 +25,29 @@ <h6 class="centerText">Add them with the "+" button in the corner!</h6>
     </ion-card-content>
   </ion-card>
 
+  <!-- Ngfor our pending friends -->
+  <div *ngIf="pendingFriends && pendingFriends.length > 0">
+    <h2 class="friendTitle centerText">Pending Friends</h2>
+    <ion-card *ngFor="let pendingFriend of pendingFriends; let i = index;" (click)="goToUser(pendingFriend)">
+
+        <!-- User name and picture -->
+        <ion-item class="animated fadeIn">
+          <ion-avatar item-left>
+            <img src="https://{{pendingFriend.profilePhotoURL}}">
+          </ion-avatar>
+          <h2>{{pendingFriend.name}}</h2>
+        </ion-item>
+
+    </ion-card>
+  </div>
+
   <!-- Ngfor our friends -->
   <div *ngIf="friends && friends.length > 0">
+    <h2 class="friendTitle centerText">Friends</h2>
     <ion-card *ngFor="let friend of friends; let i = index;" (click)="goToUser(friend)">
 
         <!-- User name and picture -->
-        <ion-item>
+        <ion-item class="animated fadeIn">
           <ion-avatar item-left>
             <img src="https://{{friend.profilePhotoURL}}">
           </ion-avatar>

client/secureChatIonic/app/pages/friends-list/friends-list.scss

@@ -0,0 +1,4 @@
+.friendTitle {
+  margin-top: 10px;
+  margin-bottom: 5px;
+}

client/secureChatIonic/app/pages/friends-list/friends-list.ts

@@ -23,10 +23,13 @@ export class FriendsListPage {
 
   friends: any;
 
+  pendingFriends: any;
+
   constructor(private changeDetector: ChangeDetectorRef, private navCtrl: NavController, private appNotify: AppNotify, private appUsers: AppUsers) {
 
     //Initialize friends
     this.friends = [];
+    this.pendingFriends = [];
   }
 
   //Call function every time the view loads
@@ -51,7 +54,10 @@ export class FriendsListPage {
       self.appNotify.stopLoading().then(function() {
 
         //Save our friends
-        self.friends = success;
+        self.friends = success.friends;
+
+        //Save our pending friends
+        self.pendingFriends = success.pendingFriends;
 
         //Update the UI
         self.changeDetector.detectChanges();

client/secureChatIonic/app/pages/malicious-key/malicious-key.html

@@ -1,6 +1,6 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>
+    <ion-title class="animated tada">
       Warning!
     </ion-title>
     <ion-buttons start>
@@ -15,9 +15,9 @@
 
 <ion-content padding>
 
-  <h1 class="maliciousKeyTitle">A public key from the server has changed!</h1>
+  <h1 class="maliciousKeyTitle animated flash">A public key from the server has changed!</h1>
 
-  <div class="maliciousKeyText">
+  <div class="maliciousKeyText animated fadeIn">
     The public key we received from the server has changed. This means, either you friend has gotten a new device, or re-installed the application, or someone may have compromised the server and is trying to intercept your messages. We <b>HIGHLY</b> suggest you contact your friend, through another medium, and compare public keys from their "My profile tab" on their device, and their public profile on you're device. The public key of you're friend will be saved to this device from now on. You may have to restart this application.
   </div>
 </ion-content>

client/secureChatIonic/app/pages/new-conversation/new-conversation.html

@@ -7,7 +7,7 @@
 <ion-header>
 
   <ion-navbar>
-    <ion-title>New Conversation</ion-title>
+    <ion-title class="aniamted fadeIn">New Conversation</ion-title>
   </ion-navbar>
 
 </ion-header>
@@ -22,10 +22,10 @@
       <ion-item *ngFor="let friend of friends | NgForTextFilter:searchQuery">
           <!-- Check Box for the item -->
           <ion-checkbox color="dark" (click)="editConvoFriends(friend)" checked="{{convoFriends.includes(friend._id)}}"></ion-checkbox>
-          <ion-avatar item-left>
+          <ion-avatar item-left class="animated fadeIn">
             <img src="https://{{friend.profilePhotoURL}}">
           </ion-avatar>
-          <ion-label>{{friend.name}}</ion-label>
+          <ion-label class="animated fadeIn">{{friend.name}}</ion-label>
       </ion-item>
     </ion-list>