Merge branch 'feature/viewer-attachment' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into feature/viewer-attachment

ios/App/App.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 81;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -498,7 +498,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 3.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -516,7 +516,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 81;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -525,7 +525,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,14 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "AppIcon-1024.png",
-      "idiom" : "iphone",
+      "idiom" : "universal",
-      "filename" : "AppIcon-20x20@2x.png",
+      "platform" : "ios",
-      "scale" : "2x"
+      "size" : "1024x1024"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-29x29@2x-1.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-20x20@2x-1.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-40x40@2x-1.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "AppIcon-512@2x.png",
-      "scale" : "1x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

ios/App/App/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

ios/App/App/Info.plist

@@ -2,82 +2,76 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
+    <key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+    <string>en</string>
-	<key>CFBundleDisplayName</key>
+    <key>CFBundleDisplayName</key>
-	<string>Gabinete Digital</string>
+    <string>Gabinete Digital</string>
-	<key>CFBundleExecutable</key>
+    <key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
+    <string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
+    <key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
+    <key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+    <string>6.0</string>
-	<key>CFBundleName</key>
+    <key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
+    <string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
+    <key>CFBundlePackageType</key>
-	<string>APPL</string>
+    <string>APPL</string>
-	<key>CFBundleShortVersionString</key>
+    <key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+    <string>$(MARKETING_VERSION)</string>
-	<key>CFBundleURLTypes</key>
+    <key>CFBundleURLTypes</key>
-	<array>
+    <array>
-		<dict>
+        <dict>
-			<key>CFBundleTypeRole</key>
+            <key>CFBundleTypeRole</key>
-			<string>Editor</string>
+            <string>Editor</string>
-			<key>CFBundleURLName</key>
+            <key>CFBundleURLName</key>
-			<string>com.gpr.gabinetedigital.teste</string>
+            <string>com.gpr.gabinetedigital.teste</string>
-			<key>CFBundleURLSchemes</key>
+            <key>CFBundleURLSchemes</key>
-			<array>
+            <array>
-				<string>gabinetedigital</string>
+                <string>gabinetedigital</string>
-			</array>
+            </array>
-		</dict>
+        </dict>
-	</array>
+    </array>
-	<key>CFBundleVersion</key>
+    <key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+    <string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>LSApplicationCategoryType</key>
+    <key>LSApplicationCategoryType</key>
-	<string></string>
+    <string></string>
-	<key>LSRequiresIPhoneOS</key>
+    <key>LSRequiresIPhoneOS</key>
-	<true/>
+    <true/>
-	<key>NSAppTransportSecurity</key>
+    <key>NSCameraUsageDescription</key>
-	<dict>
+    <string>This app requires access to the camera.</string>
-		<key>NSAllowsArbitraryLoads</key>
+    <key>NSMicrophoneUsageDescription</key>
-		<true/>
+    <string>This app does not require access to the microphone.</string>
-		<key>NSAllowsArbitraryLoadsForMedia</key>
+    <key>NSPhotoLibraryAddUsageDescription</key>
-		<true/>
+    <string>This app requires access to the photo library.</string>
-		<key>NSAllowsArbitraryLoadsInWebContent</key>
+    <key>NSPhotoLibraryUsageDescription</key>
-		<true/>
+    <string>This app requires access to the photo library.</string>
-		<key>NSAllowsLocalNetworking</key>
+    <key>UILaunchStoryboardName</key>
-		<true/>
+    <string>LaunchScreen</string>
-	</dict>
+    <key>UIMainStoryboardFile</key>
-	<key>NSCameraUsageDescription</key>
+    <string>Main</string>
-	<string>This app requires access to the camera.</string>
+    <key>UIRequiredDeviceCapabilities</key>
-	<key>NSMicrophoneUsageDescription</key>
+    <array>
-	<string>This app does not require access to the microphone.</string>
+        <string>armv7</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
+    </array>
-	<string>This app requires access to the photo library.</string>
+    <key>UISupportedInterfaceOrientations</key>
-	<key>NSPhotoLibraryUsageDescription</key>
+    <array>
-	<string>This app requires access to the photo library.</string>
+        <string>UIInterfaceOrientationPortrait</string>
-	<key>UILaunchStoryboardName</key>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
-	<string>LaunchScreen</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
-	<key>UIMainStoryboardFile</key>
+    </array>
-	<string>Main</string>
+    <key>UISupportedInterfaceOrientations~ipad</key>
-	<key>UIRequiredDeviceCapabilities</key>
+    <array>
-	<array>
+        <string>UIInterfaceOrientationPortrait</string>
-		<string>armv7</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
-	</array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
-	<key>UISupportedInterfaceOrientations</key>
+        <string>UIInterfaceOrientationLandscapeRight</string>
-	<array>
+    </array>
-		<string>UIInterfaceOrientationPortrait</string>
+    <key>UIViewControllerBasedStatusBarAppearance</key>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
+    <true/>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+    <key>NSAppTransportSecurity</key>
-	</array>
+    <dict>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+        <key>NSAllowsArbitraryLoads</key>
-	<array>
+        <true/>
-		<string>UIInterfaceOrientationPortrait</string>
+    </dict>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
 </dict>
 </plist>

ios/App/Share/Info.plist

@@ -14,30 +14,19 @@
             <key>NSExtensionAttributes</key>
             <dict>
                 <key>NSExtensionActivationRule</key>
-                <string>TRUEPREDICATE</string>
+                <dict>
+                    <key>NSExtensionActivationSupportsImageWithMaxCount</key>
+                    <integer>1</integer>
+                    <key>NSExtensionActivationSupportsMovieWithMaxCount</key>
+                    <integer>1</integer>
+                    <key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
+                    <integer>1</integer>
+                </dict>
             </dict>
             <key>NSExtensionMainStoryboard</key>
             <string>MainInterface</string>
             <key>NSExtensionPointIdentifier</key>
             <string>com.apple.share-services</string>
         </dict>
-        <key>NSExtensionAttributes</key>
-        <dict>
-            <key>NSExtensionActivationRule</key>
-            <dict>
-                <key>NSExtensionActivationSupportsFileWithMaxCount</key>
-                <integer>5</integer>
-                <key>NSExtensionActivationSupportsImageWithMaxCount</key>
-                <integer>5</integer>
-                <key>NSExtensionActivationSupportsMovieWithMaxCount</key>
-                <integer>5</integer>
-                <key>NSExtensionActivationSupportsText</key>
-                <true/>
-                <key>NSExtensionActivationSupportsWebPageWithMaxCount</key>
-                <integer>1</integer>
-                <key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
-                <integer>1</integer>
-            </dict>
-        </dict>
     </dict>
 </plist>

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -809,21 +809,35 @@ export class NewPublicationPage implements OnInit {
       path: '',
     });
 
-    this.videoconvertService.convertVideo(fullPath,directory.uri,'mp4');
+    let fileObject ={};
+    this.videoconvertService.convertVideo(fullPath,directory.uri,'mp4').then(() => {
+      Filesystem.readFile({ path: `${directory.uri}output.mp4`})
 
-    Filesystem.readFile({ path: `${directory.uri}output.mp4`})
+      .then(async (content) => {
+        console.log(content.data)
+        this.filecontent = true;
+         fileObject = {
+          FileBase64: 'data:video/mp4;base64,' + content.data,
+          FileExtension: 'mp4',
+          OriginalFileName: 'video'
+        }
+        this.seletedContent.push(fileObject)
+        fileObject ={};
+        const deleteSecretFile = async () => {
+          await Filesystem.deleteFile({
+            path: 'output.mp4',
+            directory: Directory.Cache,
+          });
+        };
+        deleteSecretFile().then((value) => {
+          console.log('delete file',value)
+          fileObject ={};
+        })
+      })
+      .catch((erro) => console.error('read converted video erro ', erro));
+    });
 
-    .then(async (content) => {
+   
-      console.log(content.data)
-      this.filecontent = true;
-      let fileObject = {
-        FileBase64: 'data:video/mp4;base64,' + content.data,
-        FileExtension: 'mp4',
-        OriginalFileName: 'video'
-      }
-      this.seletedContent.push(fileObject)
-    })
-    .catch((erro) => console.error('read converted video erro ', erro));
   } catch (error) {
       console.log('record video ios erro, ', error)
   }

src/app/services/processes.service.ts

@@ -51,7 +51,6 @@ export class ProcessesService {
     this.headers2 = new HttpHeaders();;
 
     this.headers2 = this.headers2.set('Authorization', 'Bearer ' + SessionStore.user.Authorization);
-
   }
 
   uploadFile(formData: any) {