From 73e70b19d68e55ea5dee7222ad3fa67f74531728 Mon Sep 17 00:00:00 2001
From: balzack <roland.osborne@gmail.com>
Date: Mon, 6 May 2024 19:30:32 -0700
Subject: [PATCH 1/3] use common image for dev

---
 net/container/Dockerfile.dev | 1 +
 net/container/entrypoint.sh  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net/container/Dockerfile.dev b/net/container/Dockerfile.dev
index b8c732a5..5030c6ba 100644
--- a/net/container/Dockerfile.dev
+++ b/net/container/Dockerfile.dev
@@ -40,6 +40,7 @@ RUN echo 'export PATH=$PATH:/usr/local/go/bin' >> /root/.bashrc
 RUN echo "set expandtab\nset tabstop=2\nset softtabstop=2\nset shiftwidth=2\nset encoding=utf-8\nset fileencoding=utf-8\n" > /root/.vimrc
 RUN echo "bind 'set mark-symlinked-directories on'" >> /root/.bashrc
 
+ADD dev_setup.sh /app
 ADD entrypoint.sh /app
 
 FROM scratch
diff --git a/net/container/entrypoint.sh b/net/container/entrypoint.sh
index eb3953b6..8a34565e 100755
--- a/net/container/entrypoint.sh
+++ b/net/container/entrypoint.sh
@@ -13,6 +13,7 @@ if [[ -v ADMIN ]]; then
 fi
 
 if [ "$DEV" == "1" ]; then
+  /app/dev_setup.sh || true
   while true; do
     sleep 1;
   done

From 169bf5906a6d431ba3866d3d8be643e8c09adf3d Mon Sep 17 00:00:00 2001
From: Pierre Balzack <96387156+balzack@users.noreply.github.com>
Date: Mon, 6 May 2024 22:57:18 -0700
Subject: [PATCH 2/3] fix typo on connect label

---
 net/web/src/session/contact/Contact.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/web/src/session/contact/Contact.jsx b/net/web/src/session/contact/Contact.jsx
index 74ccf717..6ee4ea6b 100644
--- a/net/web/src/session/contact/Contact.jsx
+++ b/net/web/src/session/contact/Contact.jsx
@@ -141,7 +141,7 @@ export function Contact({ close, guid, listing }) {
             )}
             { state.status === 'requested' && (
               <Tooltip placement="top" title={state.strings.acceptConnection}>
-                <Button className="button" type="primary" loading={state.busy} icon={<UserSwitchOutlined />} size="medium"  onClick={() => updateContact(actions.saveConnect)}>{ state.strings.cancel }</Button>
+                <Button className="button" type="primary" loading={state.busy} icon={<UserSwitchOutlined />} size="medium"  onClick={() => updateContact(actions.saveConnect)}>{ state.strings.connect }</Button>
               </Tooltip>
             )}
             { state.status === 'requested' && (

From 0ac7dffd29aa12169ecac0cf71246202b473664f Mon Sep 17 00:00:00 2001
From: Roland Osborne <rolandosborne@gmail.com>
Date: Wed, 8 May 2024 17:21:08 -0700
Subject: [PATCH 3/3] adding download button to viewing assets

---
 .../topicItem/audioAsset/AudioAsset.jsx       |  7 ++++++
 .../topicItem/audioAsset/AudioAsset.styled.js | 17 ++++++++++----
 .../audioAsset/useAudioAsset.hook.js          |  4 ++++
 .../topicItem/imageAsset/ImageAsset.jsx       |  6 +++++
 .../topicItem/imageAsset/ImageAsset.styled.js | 16 +++++++++++---
 .../imageAsset/useImageAsset.hook.js          |  5 ++++-
 .../topicItem/useTopicItem.hook.js            | 22 ++++++++++++++++++-
 .../topicItem/videoAsset/VideoAsset.jsx       | 10 ++++++---
 .../topicItem/videoAsset/VideoAsset.styled.js |  7 ++++++
 .../videoAsset/useVideoAsset.hook.js          |  4 ++++
 10 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.jsx b/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.jsx
index d912c7ad..3a232862 100644
--- a/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.jsx
+++ b/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.jsx
@@ -7,6 +7,7 @@ import { styles } from './AudioAsset.styled';
 import Icons from 'react-native-vector-icons/MaterialCommunityIcons';
 import audio from 'images/audio.png';
 import { useKeepAwake } from '@sayem314/react-native-keep-awake';
+import MatIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 export function AudioAsset({ asset, dismiss }) {
 
@@ -30,9 +31,15 @@ export function AudioAsset({ asset, dismiss }) {
           <Icons name="pause-circle-outline" size={92} color={Colors.text} />
         </TouchableOpacity>
       )}
+      { state.url && (
+        <TouchableOpacity style={styles.share} onPress={actions.download}>
+          <MatIcons name="share-variant-outline" size={32} color={Colors.text} />
+        </TouchableOpacity>
+      )}
       <TouchableOpacity style={styles.close} onPress={dismiss}>
         <Icons name="window-close" size={32} color={Colors.text} />
       </TouchableOpacity>
+
       { state.url && (
         <Video ref={player} source={{ uri: state.url }} repeat={true}
           paused={!state.playing} onLoad={actions.loaded} style={styles.player} />
diff --git a/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.styled.js b/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.styled.js
index 1b0d1c16..f38bf321 100644
--- a/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.styled.js
+++ b/app/mobile/src/session/conversation/topicItem/audioAsset/AudioAsset.styled.js
@@ -25,14 +25,23 @@ export const styles = StyleSheet.create({
     paddingRight: 48,
     color: Colors.text,
   },
-  close: {
-    position: 'absolute',
-    top: 0,
-    right: 0,
+  share: {
     paddingTop: 4,
     paddingBottom: 4,
     paddingLeft: 8,
     paddingRight: 8,
+    position: 'absolute',
+    top: 0,
+    left: 0,
+  },
+  close: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    paddingLeft: 8,
+    paddingRight: 8,
+    position: 'absolute',
+    top: 0,
+    right: 0,
   },
   player: {
     display: 'none',
diff --git a/app/mobile/src/session/conversation/topicItem/audioAsset/useAudioAsset.hook.js b/app/mobile/src/session/conversation/topicItem/audioAsset/useAudioAsset.hook.js
index 66408083..334b47e6 100644
--- a/app/mobile/src/session/conversation/topicItem/audioAsset/useAudioAsset.hook.js
+++ b/app/mobile/src/session/conversation/topicItem/audioAsset/useAudioAsset.hook.js
@@ -2,6 +2,7 @@ import { useState, useRef, useEffect, useContext } from 'react';
 import { ConversationContext } from 'context/ConversationContext';
 import { Image } from 'react-native';
 import { useWindowDimensions } from 'react-native';
+import Share from 'react-native-share';
 
 export function useAudioAsset(asset) {
 
@@ -47,6 +48,9 @@ export function useAudioAsset(asset) {
   }, [asset]);
 
   const actions = {
+    download: () => {
+      Share.open({ url: state.url });
+    },
     play: () => {
       updateState({ playing: true });
     },
diff --git a/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx b/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx
index be3e1493..c90d5cca 100644
--- a/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx
+++ b/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx
@@ -4,6 +4,7 @@ import { styles } from './ImageAsset.styled';
 import Colors from 'constants/Colors';
 import Ionicons from 'react-native-vector-icons/AntDesign';
 import FastImage from 'react-native-fast-image'
+import MatIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 export function ImageAsset({ asset, dismiss }) {
   const { state, actions } = useImageAsset(asset);
@@ -19,6 +20,11 @@ export function ImageAsset({ asset, dismiss }) {
             resizeMode={FastImage.resizeMode.contain} />
       )}
 
+      { state.loaded && state.controls && (
+        <TouchableOpacity style={styles.share} onPress={actions.download}>
+          <MatIcons name="share-variant-outline" size={32} color={Colors.white} />
+        </TouchableOpacity>
+      )}
       { state.loaded && state.controls && (
         <TouchableOpacity style={styles.close} onPress={dismiss}>
           <Ionicons name={'close'} size={32} color={Colors.white} />
diff --git a/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.styled.js b/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.styled.js
index 52f366a9..58259d83 100644
--- a/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.styled.js
+++ b/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.styled.js
@@ -41,15 +41,25 @@ export const styles = StyleSheet.create({
     top: 0,
     left: 0,
   },
+  share: {
+    position: 'absolute',
+    opacity: 0.9,
+    top: 0,
+    left: 0,
+    margin: 16,
+    padding: 4,
+    borderRadius: 4,
+    backgroundColor: Colors.grey,
+  },
   close: {
     position: 'absolute',
     opacity: 0.9,
     top: 0,
     right: 0,
+    margin: 16,
+    padding: 4,
     borderRadius: 4,
     backgroundColor: Colors.grey,
-    padding: 4,
-    margin: 16,
-  },
+  }
 })
 
diff --git a/app/mobile/src/session/conversation/topicItem/imageAsset/useImageAsset.hook.js b/app/mobile/src/session/conversation/topicItem/imageAsset/useImageAsset.hook.js
index 35b15e72..83c07d72 100644
--- a/app/mobile/src/session/conversation/topicItem/imageAsset/useImageAsset.hook.js
+++ b/app/mobile/src/session/conversation/topicItem/imageAsset/useImageAsset.hook.js
@@ -2,6 +2,7 @@ import { useState, useRef, useEffect, useContext } from 'react';
 import { ConversationContext } from 'context/ConversationContext';
 import { Image } from 'react-native';
 import { useWindowDimensions } from 'react-native';
+import Share from 'react-native-share';
 
 export function useImageAsset(asset) {
 
@@ -67,11 +68,13 @@ export function useImageAsset(asset) {
       const { width, height } = e.nativeEvent;
       updateState({ imageRatio: width / height });
     },
+    download: () => {
+      Share.open({ url: state.url })
+    },
     loaded: () => {
       updateState({ loaded: true });
     },
     failed: (e) => {
-console.log("FAILEE!!!", e);
       updateState({ failed: true });
     },
     showControls: () => {
diff --git a/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js b/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js
index 4f72af04..b4cd892e 100644
--- a/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js
+++ b/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js
@@ -302,6 +302,12 @@ export function useTopicItem(item, hosting, remove, contentKey) {
       return <Text>{ clickable }</Text>;
   };
 
+  const getExtension = async (path, type) => {
+    if (type === 'video') {
+        return 'mp4';
+      }
+  }
+
   const actions = {
     showCarousel: async (index) => {
       const assets = state.assets.map((asset) => ({ ...asset, error: false, decrypted: null }));
@@ -340,7 +346,20 @@ export function useTopicItem(item, hosting, remove, contentKey) {
               updateState({ assets: [ ...assets ]});
             };
 
-            asset.decrypted = path;
+            if (asset.type === 'image') {
+              const prefix = await RNFS.read(path, 64, 0, "base64");
+              const ext = prefix.startsWith('R0lGODlh') ? '.gif' : '.jpg';
+              const exists = await RNFS.exists(path + ext);
+              if (exists) {
+                RNFS.unlink(path + ext);
+              }
+              await RNFS.moveFile(path, path + ext);
+              asset.decrypted = path + ext;
+            }
+            else {
+              asset.decrypted = path;
+            }
+            
             assets[cur] = { ...asset };
             updateState({ assets: [ ...assets ]});
           };
@@ -397,6 +416,7 @@ export function useTopicItem(item, hosting, remove, contentKey) {
               const src = blob.path();
               const dir = src.split('/').slice(0,-1).join('/')
               const dst = dir + '/' + asset + '.' + getExtension(type);
+
               try {
                 await fs.unlink(dst);
               }
diff --git a/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.jsx b/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.jsx
index 5e5d4467..18ab8b10 100644
--- a/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.jsx
+++ b/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.jsx
@@ -7,8 +7,7 @@ import Icons from 'react-native-vector-icons/MaterialCommunityIcons';
 import { useKeepAwake } from '@sayem314/react-native-keep-awake';
 import FastImage from 'react-native-fast-image'
 import { SafeAreaView } from 'react-native-safe-area-context';
-
-import { useEffect } from 'react';
+import MatIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 export function VideoAsset({ asset, dismiss }) {
 
@@ -38,9 +37,14 @@ export function VideoAsset({ asset, dismiss }) {
             <Icons name="pause-circle-outline" size={92} color={Colors.white} />
           </TouchableOpacity>
         )}
+        { (state.controls || !state.playing) && state.videoLoaded && (
+          <TouchableOpacity style={styles.share} onPress={actions.download}>
+            <MatIcons name="share-variant-outline" size={32} color={Colors.white} />
+          </TouchableOpacity>
+        )}
         { (state.controls || !state.playing) && state.videoLoaded && (
           <TouchableOpacity style={styles.close} onPress={dismiss}>
-            <Icons name="window-close" size={32} color={Colors.white} />
+             <Icons name="window-close" size={32} color={Colors.white} />
           </TouchableOpacity>
         )}
       </TouchableOpacity>
diff --git a/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.styled.js b/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.styled.js
index 2068d35a..f29d27b1 100644
--- a/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.styled.js
+++ b/app/mobile/src/session/conversation/topicItem/videoAsset/VideoAsset.styled.js
@@ -47,6 +47,13 @@ export const styles = StyleSheet.create({
     paddingRight: 16,
     paddingTop: 16,
   },
+  share: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    paddingLeft: 16,
+    paddingTop: 16,
+  },
   loading: {
     position: 'absolute',
     display: 'flex',
diff --git a/app/mobile/src/session/conversation/topicItem/videoAsset/useVideoAsset.hook.js b/app/mobile/src/session/conversation/topicItem/videoAsset/useVideoAsset.hook.js
index aaa24afd..8131d97d 100644
--- a/app/mobile/src/session/conversation/topicItem/videoAsset/useVideoAsset.hook.js
+++ b/app/mobile/src/session/conversation/topicItem/videoAsset/useVideoAsset.hook.js
@@ -2,6 +2,7 @@ import { useState, useRef, useEffect, useContext } from 'react';
 import { ConversationContext } from 'context/ConversationContext';
 import { Image } from 'react-native';
 import { useWindowDimensions } from 'react-native';
+import Share from 'react-native-share';
 
 export function useVideoAsset(asset) {
 
@@ -71,6 +72,9 @@ export function useVideoAsset(asset) {
   }, [asset]);
 
   const actions = {
+    download: () => {
+      Share.open({ url: state.url });
+    },
     setThumbSize: (e) => {
       const { width, height } = e.nativeEvent || {};
       updateState({ thumbLoaded: true, thumbRatio: width / height });