Notifications working againd

android/.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" charset="UTF-8" />
-  </component>
-</project>

android/app/src/main/AndroidManifest.xml.orig

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest package="com.gpr.gabinetedigital" xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:name=".App" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="com.gpr.gabinetedigital.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <provider android:authorities="${applicationId}.fileprovider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
+        </provider>
+    </application>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+</manifest>

android/app/src/main/assets/capacitor.config.json

@@ -16,5 +16,8 @@
 				"sound"
 			]
 		}
+	},
+	"server": {
+		"url": "http://192.168.137.1:8100"
 	}
 }

android/build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-
+    
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.google.gms:google-services:4.3.5'
 
         // NOTE: Do not place your application dependencies here; they belong

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/app/modals/view-media/view-media.page.html

@@ -24,11 +24,12 @@
               <img src="{{image}}">
             </div>
             <div *ngIf="type == 'application/pdf'">
-              <pdf-viewer [src]="image"
+              <object [data]="image|safehtml" type="application/pdf" style="width: 400px; height: 500px"></object>
+              <!-- <pdf-viewer [src]="image"
               [render-text]="true"
               [original-size]="false"
               style="width: 400px; height: 500px"
-  ></pdf-viewer>
+  ></pdf-viewer> -->
             </div>
           </div>
         </ion-slide>

src/app/pages/chat/messages/messages.page.ts

@@ -1070,8 +1070,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       //this.testDownlod(msg)
 
     } else {
-      var str = msg.attachments[0].image_url;
-      str = str.substring(1, ((str.length) - 1));
+      /* var str = msg.attachments[0].image_url;
+      str = str.substring(1, ((str.length) - 1)); */
 
       const modal = await this.modalController.create({
         component: ViewMediaPage,

src/app/services/notifications.service.ts

@@ -86,86 +86,86 @@ export class NotificationsService {
   }
 
   requestPermissions() {
-    // PushNotifications.requestPermissions().then(result => {
-    //   if (result.receive === 'granted') {
-    //     // Register with Apple / Google to receive push via APNS/FCM
-    //     PushNotifications.register();
-    //   } else {
-    //     // Show some error
-    //   }
-    // });
+     PushNotifications.requestPermissions().then(result => {
+       if (result.receive === 'granted') {
+         // Register with Apple / Google to receive push via APNS/FCM
+         PushNotifications.register();
+       } else {
+         // Show some error
+       }
+     });
   }
 
   getAndpostToken(username) {
-    // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-    //   console.log('Notifications not supported')
-    // } else {
-    //   const geturl = environment.apiURL + 'notifications/token';
-    //   PushNotifications.addListener('registration',
-    //     (token: Token) => {
-    //       console.log('token: ', token.value)
-    //       this.storageService.store(username, token.value);
-    //       this.storageService.get(username).then(value => {
-    //         console.log('STORAGE TOKEN', value)
-    //         this.storageService.get(AuthConnstants.USER).then(res => {
-    //           console.log('USERID', res);
-    //           const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
-    //           const body = {
-    //             UserId: res.UserId,
-    //             TokenId: token.value,
-    //             Status: 1,
-    //             Service: 1
-    //           };
+     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+       console.log('Notifications not supported')
+     } else {
+       const geturl = environment.apiURL + 'notifications/token';
+       PushNotifications.addListener('registration',
+         (token: Token) => {
+           console.log('token: ', token.value)
+           this.storageService.store(username, token.value);
+           this.storageService.get(username).then(value => {
+             console.log('STORAGE TOKEN', value)
+             this.storageService.get(AuthConnstants.USER).then(res => {
+               console.log('USERID', res);
+               const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
+               const body = {
+                 UserId: res.UserId,
+                 TokenId: token.value,
+                 Status: 1,
+                 Service: 1
+               };
 
-    //           this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => {
-    //             console.log('TOKEN USER MIDLE', data);
-    //           }, (error) => {
-    //             console.log('Post token to backend', error)
-    //           })
-    //         });
+               this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => {
+                 console.log('TOKEN USER MIDLE', data);
+               }, (error) => {
+                 console.log('Post token to backend', error)
+               })
+             });
 
-    //       });
-    //     }
-    //   );
-    // }
+           });
+         }
+       );
+     }
 
   }
 
   registrationError() {
-    // PushNotifications.addListener('registrationError',
-    //   (error: any) => {
-    //     console.log('Error on registration: ' + JSON.stringify(error));
-    //   }
-    // );
+     PushNotifications.addListener('registrationError',
+       (error: any) => {
+         console.log('Error on registration: ' + JSON.stringify(error));
+       }
+     );
   }
 
   onReciveForeground() {
-    // PushNotifications.addListener('pushNotificationReceived',
-    //   (notification: PushNotificationSchema) => {
-    //     console.log('Push received: ' + JSON.stringify(notification));
-    //     this.DataArray.push(notification)
-    //     console.log("On ReceiveNotification", this.DataArray)
-    //     this.storageService.store("Notifications", this.DataArray)
-    //     this.eventtrigger.publishSomeData({
-    //       notification: "recive"
-    //     })
-    //   }
-    // );
+     PushNotifications.addListener('pushNotificationReceived',
+       (notification: PushNotificationSchema) => {
+         console.log('Push received: ' + JSON.stringify(notification));
+         this.DataArray.push(notification)
+         console.log("On ReceiveNotification", this.DataArray)
+         this.storageService.store("Notifications", this.DataArray)
+         this.eventtrigger.publishSomeData({
+           notification: "recive"
+         })
+       }
+     );
   }
 
   onReciveBackground() {
-    // PushNotifications.addListener('pushNotificationActionPerformed',
-    //   (notification: ActionPerformed) => {
-    //     console.log('Push action performed: ' + JSON.stringify(notification));
-    //    /*  this.DataArray.push(notification.notification)
-    //     console.log("On ReceiveNotification", this.DataArray)
-    //     this.storageService.store("Notifications", this.DataArray)
-    //     this.eventtrigger.publishSomeData({
-    //       notification: "recive"
-    //     }) */
-    //     this.notificatinsRoutes(notification)
-    //   }
-    // );
+     PushNotifications.addListener('pushNotificationActionPerformed',
+       (notification: ActionPerformed) => {
+         console.log('Push action performed: ' + JSON.stringify(notification));
+        /*  this.DataArray.push(notification.notification)
+         console.log("On ReceiveNotification", this.DataArray)
+         this.storageService.store("Notifications", this.DataArray)
+         this.eventtrigger.publishSomeData({
+           notification: "recive"
+         }) */
+         this.notificatinsRoutes(notification)
+       }
+     );
   }
 
   tempClearArray() {
@@ -175,51 +175,51 @@ export class NotificationsService {
 
   notificatinsRoutes = (notification) => {
 
-    // console.log('Push action performed 2222: ' + JSON.stringify(notification.data));
+     console.log('Push action performed 2222: ' + JSON.stringify(notification.data));
 
-    // if (notification.notification.data.Service === "agenda" && notification.notification.data.IdObject.length > 10) {
-    //   console.log("Id Lenght", notification.notification.data.IdObject.length)
-    //   this.zone.run(() => this.router.navigate(['/home/agenda', notification.notification.data.IdObject, 'agenda']));
-    // }
-    // else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expediente") {
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.notification.data.IdObject, 'gabinete-digital']));
-    // }
-    // else if (notification.notification.data.Service === "agenda" && notification.notification.data.Object === "event-list") {
-    //   //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda']));
-    //   this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.notification.data.IdObject, 'agenda']));
+     if (notification.notification.data.Service === "agenda" && notification.notification.data.IdObject.length > 10) {
+       console.log("Id Lenght", notification.notification.data.IdObject.length)
+       this.zone.run(() => this.router.navigate(['/home/agenda', notification.notification.data.IdObject, 'agenda']));
+     }
+     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expediente") {
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.notification.data.IdObject, 'gabinete-digital']));
+     }
+     else if (notification.notification.data.Service === "agenda" && notification.notification.data.Object === "event-list") {
+       //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda']));
+       this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.notification.data.IdObject, 'agenda']));
 
-    // } else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos") {
+     } else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos") {
 
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.notification.data.IdObject, 'gabinete-digital'], { replaceUrl: true }));
-    // }
-    // else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "parecer") {
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.notification.data.IdObject, 'gabinete-digital'], { replaceUrl: true }));
+     }
+     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "parecer") {
 
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital']));
-    // }
-    // else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "deferimento") {
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital']));
+     }
+     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "deferimento") {
 
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital']));
-    // }
-    // else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos-pr") {
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital']));
+     }
+     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos-pr") {
 
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.notification.data.IdObject, 'gabinete-digital']));
-    // }
-    // else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "accao") {
-    //   this.zone.run(() => this.router.navigate(['/home/publications', notification.notification.data.IdObject]));
-    // }
-    // else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "publicacao") {
-    //   this.zone.run(() => this.router.navigate(['/home/publications/view-publications', notification.notification.data.FolderId, notification.data.IdObject]));
-    // }
-    // else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diplomas") {
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.notification.data.IdObject, 'gabinete-digital']));
-    // }
-    // else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diplomas-assinar") {
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.notification.data.IdObject, 'gabinete-digital']));
+     }
+     else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "accao") {
+       this.zone.run(() => this.router.navigate(['/home/publications', notification.notification.data.IdObject]));
+     }
+     else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "publicacao") {
+       this.zone.run(() => this.router.navigate(['/home/publications/view-publications', notification.notification.data.FolderId, notification.data.IdObject]));
+     }
+     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diplomas") {
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.notification.data.IdObject, 'gabinete-digital']));
+     }
+     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diplomas-assinar") {
 
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', notification.notification.data.IdObject, 'gabinete-digital']));
-    // }
-    // else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes-pr") {
-    //   this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.notification.data.IdObject, 'gabinete-digital']));
-    // }
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', notification.notification.data.IdObject, 'gabinete-digital']));
+     }
+     else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes-pr") {
+       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.notification.data.IdObject, 'gabinete-digital']));
+     }
 
   }
 

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -7,7 +7,7 @@
   </div>
   <div class="buttons">
     <button  (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
-    <!-- <button (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button> -->
+    <button (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
     <button (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
     <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
     <div class="solid"></div>