Merge branch 'hotfix'

marckohlbrugge · Jun 10, 2022 · 2672da1 · 2672da1
2 parents 758429d + c00fb77
commit 2672da1
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 17 deletions.
diff --git a/build/background.png b/build/background.png
diff --git a/build/background.tiff b/build/background.tiff
diff --git a/build/background@2x.png b/build/background@2x.png
diff --git a/build/create_background.src b/build/create_background.src
@@ -0,0 +1 @@
+tiffutil -cathidpicheck background.png background@2x.png -out background.tiff
diff --git a/build/entitlements.mas.loginhelper.plist b/build/entitlements.mas.loginhelper.plist
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-  </dict>
+	<dict>
+		<key>com.apple.security.app-sandbox</key>
+		<true/>
+		<key>com.apple.security.inherit</key>
+		<true/>
+	</dict>
 </plist>
diff --git a/build/entitlements.mas.plist b/build/entitlements.mas.plist
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.application-groups</key>
-    <string>Y9VMFY8SNZ.chat.wip.menubar</string>
-    <key>com.apple.security.files.user-selected.read-write</key>
-    <true/>
-    <key>com.apple.security.network.client</key>
-    <true/>
-  </dict>
+	<dict>
+		<key>com.apple.security.app-sandbox</key>
+		<true/>
+		<key>com.apple.security.application-groups</key>
+		<array>
+			<string>Y9VMFY8SNZ.chat.wip.menubar</string>
+		</array>
+		<key>com.apple.security.files.user-selected.read-only</key>
+		<true/>
+		<key>com.apple.security.network.client</key>
+		<true/>
+	</dict>
 </plist>
diff --git a/build/icon.icns b/build/icon.icns
diff --git a/build/icon1024.png b/build/icon1024.png
diff --git a/build/info.plist b/build/info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+  <key>ElectronTeamID</key>
+  <string>Y9VMFY8SNZ</string>
   <key>com.apple.developer.team-identifier</key>
   <string>Y9VMFY8SNZ</string>
   <key>com.apple.application-identifier</key>

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -20,6 +20,16 @@ publish:
   owner: marckohlbrugge
   vPrefixedTagName: true
 
+dmg:
+  background: ./build/background.tiff
+  icon: ./build/icon.icns
+  iconSize: 128
+  contents:
+    [
+      { x: 460, y: 167, type: link, path: /Applications },
+      { x: 138, y: 167, type: file },
+    ]
+
 mac:
   target:
     - target: default
@@ -49,7 +59,7 @@ mas:
   provisioningProfile: embedded.provisionprofile
   icon: resource/app.icns
   darkModeSupport: true
-  hardenedRuntime: true
+  hardenedRuntime: false
   extendInfo:
     LSUIElement: 1
 

diff --git a/src/compose/vue/Attachments.vue b/src/compose/vue/Attachments.vue
@@ -30,8 +30,7 @@ export default {
       const file_copy = {
         path: file.path,
         name: file_name || file.name,
-        size: file.size,
-        obj: file,
+        size: file.size
       };
 
       if (file.path) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		tiffutil -cathidpicheck background.png background@2x.png -out background.tiff