Merge branch 'main' of https://github.com/balzack/databag into main

balzack · Mar 13, 2024 · 10ad2fd · 10ad2fd
2 parents d7046fb + 26095d2
commit 10ad2fd
Show file tree

Hide file tree

Showing 2,385 changed files with 149 additions and 418,247 deletions.
diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ Install without a container in AWS [here](/doc/aws.md).
 
 Integrate Databag in an OpenWrt firmware [here](/doc/openwrt.md).
 
-1-click installs in [CapRover](https://caprover.com/), [CasaOS](https://casaos.io), [Unraid](https://unraid.net/), [Runtipi](https://www.runtipi.io/), [Kubero](https://www.kubero.dev/)
+1-click installs in [CapRover](https://caprover.com/), [CasaOS](https://casaos.io), [Unraid](https://unraid.net/), [Runtipi](https://www.runtipi.io/), [Kubero](https://www.kubero.dev/), [Umbrel](https://umbrel.com/)
 
 ## Audio and Video Calls
 

diff --git a/app/mobile/ios/Databag.xcodeproj/project.pbxproj b/app/mobile/ios/Databag.xcodeproj/project.pbxproj
@@ -282,8 +282,8 @@
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */,
 				E235C05ADACE081382539298 /* [CP] Copy Pods Resources */,
-				D347E695755653CE8D39CFDD /* [CP-User] [RNFB] Core Configuration */,
 				7B4A534529F39E250036F3ED /* Embed Foundation Extensions */,
+				D347E695755653CE8D39CFDD /* [CP-User] [RNFB] Core Configuration */,
 			);
 			buildRules = (
 			);
@@ -674,11 +674,12 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Databag/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Databag;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.22;
+				MARKETING_VERSION = 1.25;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -708,11 +709,12 @@
 				DEVELOPMENT_TEAM = 3P65PQ7SUR;
 				INFOPLIST_FILE = Databag/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Databag;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.22;
+				MARKETING_VERSION = 1.25;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/app/mobile/ios/Podfile b/app/mobile/ios/Podfile
@@ -51,6 +51,14 @@ target 'Databag' do
   end
 
   post_install do |installer|
+
+    installer.pods_project.targets.each do |target|
+          target.build_configurations.each do |config|
+                 config.build_settings['SWIFT_VERSION'] = '5.0'
+                 config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.4'
+         end
+    end
+
     react_native_post_install(
       installer,
       # Set `mac_catalyst_enabled` to `true` in order to apply patches

diff --git a/app/mobile/ios/Podfile.lock b/app/mobile/ios/Podfile.lock
@@ -20,9 +20,9 @@ PODS:
     - GoogleUtilities/Logger (~> 7.8)
   - FirebaseCoreExtension (10.7.0):
     - FirebaseCore (~> 10.0)
-  - FirebaseCoreInternal (10.9.0):
+  - FirebaseCoreInternal (10.22.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.9.0):
+  - FirebaseInstallations (10.22.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
@@ -38,47 +38,58 @@ PODS:
     - nanopb (< 2.30910.0, >= 2.30908.0)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - GoogleDataTransport (9.2.2):
+  - GoogleDataTransport (9.4.1):
     - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.11.1):
+  - GoogleUtilities/AppDelegateSwizzler (7.13.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.1):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (7.13.0):
+    - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.1):
+  - GoogleUtilities/Logger (7.13.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.11.1):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (7.13.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.1)"
-  - GoogleUtilities/Reachability (7.11.1):
+  - "GoogleUtilities/NSData+zlib (7.13.0)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (7.13.0)
+  - GoogleUtilities/Reachability (7.13.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.11.1):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (7.13.0):
     - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - hermes-engine (0.71.3):
     - hermes-engine/Pre-built (= 0.71.3)
   - hermes-engine/Pre-built (0.71.3)
-  - JitsiWebRTC (106.0.0)
+  - JitsiWebRTC (118.0.0)
   - libevent (2.1.12)
-  - libwebp (1.2.4):
-    - libwebp/demux (= 1.2.4)
-    - libwebp/mux (= 1.2.4)
-    - libwebp/webp (= 1.2.4)
-  - libwebp/demux (1.2.4):
+  - libwebp (1.3.2):
+    - libwebp/demux (= 1.3.2)
+    - libwebp/mux (= 1.3.2)
+    - libwebp/sharpyuv (= 1.3.2)
+    - libwebp/webp (= 1.3.2)
+  - libwebp/demux (1.3.2):
     - libwebp/webp
-  - libwebp/mux (1.2.4):
+  - libwebp/mux (1.3.2):
     - libwebp/demux
-  - libwebp/webp (1.2.4)
-  - nanopb (2.30909.0):
-    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (2.30909.0)
-  - nanopb/encode (2.30909.0)
-  - PromisesObjC (2.2.0)
+  - libwebp/sharpyuv (1.3.2)
+  - libwebp/webp (1.3.2):
+    - libwebp/sharpyuv
+  - nanopb (2.30909.1):
+    - nanopb/decode (= 2.30909.1)
+    - nanopb/encode (= 2.30909.1)
+  - nanopb/decode (2.30909.1)
+  - nanopb/encode (2.30909.1)
+  - PromisesObjC (2.4.0)
   - RCT-Folly (2021.07.22.00):
     - boost
     - DoubleConversion
@@ -359,8 +370,8 @@ PODS:
     - react-native-video/Video (= 5.2.1)
   - react-native-video/Video (5.2.1):
     - React-Core
-  - react-native-webrtc (106.0.7):
-    - JitsiWebRTC (~> 106.0.0)
+  - react-native-webrtc (118.0.2):
+    - JitsiWebRTC (~> 118.0.0)
     - React-Core
   - React-perflogger (0.71.3)
   - React-RCTActionSheet (0.71.3):
@@ -736,19 +747,19 @@ SPEC CHECKSUMS:
   Firebase: 0219acf760880eeec8ce479895bd7767466d9f81
   FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7
   FirebaseCoreExtension: f17247ba8c61e4d3c8d136b5e2de3cb4ac6a85b6
-  FirebaseCoreInternal: d2b4acb827908e72eca47a9fd896767c3053921e
-  FirebaseInstallations: c58489c9caacdbf27d1da60891a87318e20218e0
+  FirebaseCoreInternal: bca337352024b18424a61e478460547d46c4c753
+  FirebaseInstallations: 763814908793c0da14c18b3dcffdec71e29ed55e
   FirebaseMessaging: ac9062bcc35ed56e15a0241d8fd317022499baf8
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  GoogleDataTransport: 8378d1fa8ac49753ea6ce70d65a7cb70ce5f66e6
-  GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
+  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
+  GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
   hermes-engine: 38bfe887e456b33b697187570a08de33969f5db7
-  JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb
+  JitsiWebRTC: 3a41671ef65a51d7204323814b055a2690b921c7
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
-  PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
+  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
+  nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: bec48f07daf7bcdc2655a0cde84e07d24d2a9e2a
   RCTTypeSafety: 171394eebacf71e1cfad79dbfae7ee8fc16ca80a
@@ -774,7 +785,7 @@ SPEC CHECKSUMS:
   react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
   react-native-unifiedpush-connector: 4d60170e5eb46329f15e5da6c1171d3683480bf4
   react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
-  react-native-webrtc: 0df36747802476e758af6b6dceccdeaed8c826c2
+  react-native-webrtc: a0a8a1730b6cc5a5bda8a6e2166a74c9b78029e2
   React-perflogger: af8a3d31546077f42d729b949925cc4549f14def
   React-RCTActionSheet: 57cc5adfefbaaf0aae2cf7e10bccd746f2903673
   React-RCTAnimation: 11c61e94da700c4dc915cf134513764d87fc5e2b
@@ -807,6 +818,6 @@ SPEC CHECKSUMS:
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   Yoga: 5ed1699acbba8863755998a4245daa200ff3817b
 
-PODFILE CHECKSUM: 8a4cbf61c865c6e404d389f26395fa04926b8f43
+PODFILE CHECKSUM: 75c662c715519b020ac15abd8a3a0e3c1e6d2ba5
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2
diff --git a/app/mobile/package.json b/app/mobile/package.json
@@ -49,7 +49,7 @@
     "react-native-unifiedpush-connector": "^0.1.5",
     "react-native-vector-icons": "^9.2.0",
     "react-native-video": "^5.2.1",
-    "react-native-webrtc": "^106.0.7",
+    "react-native-webrtc": "^118.0.2",
     "react-native-wheel-color-picker": "^1.2.0",
     "react-router-dom": "^6.8.1",
     "react-router-native": "^6.8.1",

diff --git a/app/mobile/src/constants/Strings.js b/app/mobile/src/constants/Strings.js
@@ -200,6 +200,8 @@ const Strings = [
     deleteMessage: 'Delete Message',
     blockMessage: 'Block Message',
     reportMessage: 'Report Message',
+    select: 'Select',
+    selectTopic: 'Select Topic for Sharing',
   },
   {
     languageCode: 'fr',
@@ -396,6 +398,8 @@ const Strings = [
     deleteMessage: 'Supprimer le Message',
     blockMessage: 'Bloquer le Message',
     reportMessage: 'Signaler le Message',
+    select: 'Choisir',
+    selectTopic: 'Choisissez le sujet à partager',
   },
   {
     languageCode: 'es',
@@ -592,6 +596,9 @@ const Strings = [
     deleteMessage: 'Borrar Mensaje',
     blockMessage: 'Bloquear Mensaje',
     reportMessage: 'Reportar Mensaje',
+
+    select: 'Elegir',
+    selectTopic: 'Elija un tema para compartir',
   },
   {
     languageCode: 'de',
@@ -788,6 +795,9 @@ const Strings = [
     deleteMessage: 'Nachricht Löschen',
     blockMessage: 'Blockieren Sie die Nachricht',
     reportMessage: 'Melden Sie die Nachricht',
+
+    select: 'Wählen',
+    selectTopic: 'Wählen Sie ein Thema zum Teilen aus',
   },
   {
     languageCode: 'pt',
@@ -969,6 +979,9 @@ const Strings = [
     deleteMessage: 'Apagar Mensagem',
     blockMessage: 'Bloquear Mensagem',
     reportMessage: 'Denunciar Mensagem',
+
+    select: 'Escolher',
+    selectTopic: 'Escolha o tópico para compartilhar',
   },
   {
     languageCode: 'ru',
@@ -1148,6 +1161,9 @@ const Strings = [
     deleteMessage: 'Удаленное сообщение',
     blockMessage: 'Заблокировать сообщение',
     reportMessage: 'Пожаловаться на сообщение',
+
+    select: 'выбирать',
+    selectTopic: 'Выберите тему для обмена',
   }
 ];
 

diff --git a/app/mobile/src/session/details/Details.jsx b/app/mobile/src/session/details/Details.jsx
@@ -143,8 +143,8 @@ export function Details({ channel, clearConversation }) {
 
       <View style={styles.members}>
         <Text style={styles.membersLabel}>{ state.strings.members }</Text>
-        { state.count - state.members.length > 0 && (
-          <Text style={styles.unknown}> (+ {state.count - state.contacts.length}) { state.strings.unknown }</Text>
+        { state.unknown > 0 && (
+          <Text style={styles.unknown}> (+ {state.unknown}) { state.strings.unknown }</Text>
         )}
       </View>
 

diff --git a/app/mobile/src/session/sharing/Sharing.jsx b/app/mobile/src/session/sharing/Sharing.jsx
@@ -3,17 +3,19 @@ import { TouchableOpacity, Text, View, FlatList } from 'react-native';
 import { useSharing } from './useSharing.hook';
 import { styles } from './Sharing.styled';
 import { SharingItem } from './sharingItem/SharingItem';
+import { getLanguageStrings } from 'constants/Strings';
 
 export function Sharing({ select, cancel }) {
 
+  const strings = getLanguageStrings();
   const [selection, setSelection] = useState(null);
   const { state, actions } = useSharing();
 
   return (
     <View style={styles.sharingBase}>
       <View style={styles.sharingFrame}>
         <View style={styles.header}>
-          <Text style={styles.headerText}>Select Topic for Sharing</Text>
+          <Text style={styles.headerText}>{ strings.selectTopic }</Text>
         </View>
         <FlatList
           style={styles.content}
@@ -23,19 +25,19 @@ export function Sharing({ select, cancel }) {
           keyExtractor={item => (`${item.cardId}:${item.channelId}`)}
         />
         <View style={styles.controls}>
+          <TouchableOpacity style={styles.cancel} onPress={cancel}>
+            <Text style={styles.cancelText}>{ strings.cancel }</Text>
+          </TouchableOpacity>
           { !selection && (
             <View style={styles.disabled}>
-              <Text style={styles.disabledText}>Select</Text>
+              <Text style={styles.disabledText}>{ strings.select }</Text>
             </View>
           )}
           { selection && (
             <TouchableOpacity style={styles.select} onPress={() => select(selection)}>
-              <Text style={styles.selectText}>Select</Text>
+              <Text style={styles.selectText}>{ strings.select }</Text>
             </TouchableOpacity>
           )}
-          <TouchableOpacity style={styles.cancel} onPress={cancel}>
-            <Text style={styles.cancelText}>Cancel</Text>
-          </TouchableOpacity>
         </View>
       </View>
     </View>

diff --git a/app/mobile/src/session/sharing/Sharing.styled.js b/app/mobile/src/session/sharing/Sharing.styled.js
@@ -8,10 +8,10 @@ export const styles = StyleSheet.create({
     height: '100%',
     alignItems: 'center',
     justifyContent: 'center',
-    backgroundColor: 'rgba(52, 52, 52, 0.8)'
+    backgroundColor: 'rgba(0,0,0, 0.8)'
   },
   sharingFrame: {
-    backgroundColor: Colors.formBackground,
+    backgroundColor: Colors.drawerBase,
     width: '80%',
     height: '80%',
     maxWidth: 400,
@@ -29,6 +29,7 @@ export const styles = StyleSheet.create({
   },
   headerText: {
     fontSize: 18,
+    color: Colors.text,
   },
   content: {
     width: '100%',

diff --git a/app/mobile/src/session/sharing/sharingItem/SharingItem.styled.js b/app/mobile/src/session/sharing/sharingItem/SharingItem.styled.js
@@ -23,7 +23,7 @@ export const styles = StyleSheet.create({
     borderColor: Colors.itemDivider,
     paddingLeft: 16,
     paddingRight: 16,
-    backgroundColor: Colors.background,
+    backgroundColor: Colors.areaBase,
   },
   detail: {
     paddingLeft: 12,
@@ -45,7 +45,7 @@ export const styles = StyleSheet.create({
     fontSize: 14,
   },
   message: {
-    color: Colors.lightText,
+    color: Colors.descriptionText,
     fontSize: 12,
   },
 })