oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added the group namespaces and added better build script error handling

This commit is contained in:
Morgan Pretty 2023-08-21 17:16:42 +10:00
parent 674d99cea3
commit 812a951aba
4 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Scripts/build_libSession_util.sh
View File

@ -196,8 +196,23 @@ for i in "${!TARGET_ARCHS[@]}"; do
-DENABLE_BITCODE=$ENABLE_BITCODE
if [ $? -ne 0 ]; then
LAST_OUTPUT=$(tail -n 4 "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log" | head -n 1)
echo_message "error: $LAST_OUTPUT"
ALL_ERROR_LINES=($(grep -n "error:" "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log" | cut -d ":" -f 1))
for e in "${!ALL_ERROR_LINES[@]}"; do
error_line="${ALL_ERROR_LINES[$e]}"
error=$(sed "${error_line}q;d" "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log")
# If it was a CMake Error then the actual error will be on the next line so we want to append that info
if [[ $error == *'CMake Error'* ]]; then
actual_error_line=$((error_line + 1))
error="${error}$(sed "${actual_error_line}q;d" "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log")"
fi
# Exclude the 'ALL_ERROR_LINES' line and the 'grep' line
if [[ ! $error == *'grep -n "error'* ]] && [[ ! $error == *'grep -n error'* ]]; then
echo_message "error: $error"
fi
done
exit 1
fi
done

4
SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
View File

@ -7,7 +7,9 @@ import SessionSnodeKit
import SessionUtilitiesKit
public final class ClosedGroupPoller: Poller {
public static var namespaces: [SnodeAPI.Namespace] = [.legacyClosedGroup]
public static var namespaces: [SnodeAPI.Namespace] = [
.legacyClosedGroup, .default, .configGroupInfo, .configGroupMembers, .configGroupKeys
]
// MARK: - Settings

3
SessionMessagingKitTests/LibSessionUtil/Configs/ConfigGroupInfoSpec.swift Normal file
View File

@ -0,0 +1,3 @@
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
import Foundation

10
SessionSnodeKit/Types/SnodeAPINamespace.swift
View File

@ -10,7 +10,9 @@ public extension SnodeAPI {
case configContacts = 3
case configConvoInfoVolatile = 4
case configUserGroups = 5
case configClosedGroupInfo = 11
case configGroupInfo = 11
case configGroupMembers = 12
case configGroupKeys = 13
case legacyClosedGroup = -10
@ -52,7 +54,8 @@ public extension SnodeAPI {
case .configUserProfile, .configContacts,
.configConvoInfoVolatile, .configUserGroups,
.configClosedGroupInfo, .all:
.configGroupInfo, .configGroupMembers, .configGroupKeys,
.all:
return false
}
}
@ -88,7 +91,8 @@ public extension SnodeAPI {
case .configUserProfile, .configContacts,
.configConvoInfoVolatile, .configUserGroups,
.configClosedGroupInfo, .all:
.configGroupInfo, .configGroupMembers, .configGroupKeys,
.all:
return 1
}
}