Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xx messenger iOS
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile
iOS
xx messenger iOS
Commits
21bef5bc
Commit
21bef5bc
authored
Jun 24, 2022
by
Bruno Muniz
Browse files
Options
Downloads
Patches
Plain Diff
Updated version of db package an fixed push handler
parent
2c74045e
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!40
v1.1.2b166
,
!38
Using new database structure
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Package.swift
+1
-1
1 addition, 1 deletion
Package.swift
Sources/PushFeature/PushHandler.swift
+6
-1
6 additions, 1 deletion
Sources/PushFeature/PushHandler.swift
client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
+2
-2
2 additions, 2 deletions
client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
with
9 additions
and
4 deletions
Package.swift
+
1
−
1
View file @
21bef5bc
...
...
@@ -66,7 +66,7 @@ let package = Package(
.
package
(
url
:
"https://github.com/pointfreeco/combine-schedulers"
,
from
:
"0.5.0"
),
.
package
(
url
:
"https://github.com/kishikawakatsumi/KeychainAccess"
,
from
:
"4.2.1"
),
.
package
(
url
:
"https://github.com/google/google-api-objectivec-client-for-rest"
,
from
:
"1.6.0"
),
.
package
(
url
:
"https://git.xx.network/elixxir/client-ios-db.git"
,
.
upToNextMajor
(
from
:
"1.0.
1
"
)),
.
package
(
url
:
"https://git.xx.network/elixxir/client-ios-db.git"
,
.
upToNextMajor
(
from
:
"1.0.
2
"
)),
.
package
(
url
:
"https://github.com/firebase/firebase-ios-sdk.git"
,
.
upToNextMajor
(
from
:
"8.10.0"
)),
.
package
(
url
:
"https://github.com/pointfreeco/swift-composable-architecture.git"
,
.
upToNextMajor
(
from
:
"0.32.0"
))
],
...
...
This diff is collapsed.
Click to expand it.
Sources/PushFeature/PushHandler.swift
+
6
−
1
View file @
21bef5bc
...
...
@@ -103,9 +103,14 @@ public final class PushHandler: PushHandling {
return
}
let
dbPath
=
FileManager
.
default
.
containerURL
(
forSecurityApplicationGroupIdentifier
:
"group.elixxir.messenger"
)
!
.
appendingPathComponent
(
"xxm_database"
)
.
appendingPathExtension
(
"sqlite"
)
.
path
let
tuples
:
[(
String
,
Push
)]
=
pushes
.
compactMap
{
guard
let
userId
=
$0
.
source
,
let
dbManager
=
try
?
Database
.
inMemory
(
),
let
dbManager
=
try
?
Database
.
onDisk
(
path
:
dbPath
),
let
contact
=
try
?
dbManager
.
fetchContacts
(
.
init
(
id
:
[
userId
]))
.
first
else
{
return
(
$0
.
type
.
unknownSenderContent
!
,
$0
)
}
...
...
This diff is collapsed.
Click to expand it.
client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
+
2
−
2
View file @
21bef5bc
...
...
@@ -50,8 +50,8 @@
"kind" : "remoteSourceControl",
"location" : "https://git.xx.network/elixxir/client-ios-db.git",
"state" : {
"revision" : "
8674619071b9e2aa909b0626b0b37e64129c4841
",
"version" : "1.0.
1
"
"revision" : "
0fde5504ee087c13c5181b205869ea7dbffed900
",
"version" : "1.0.
2
"
}
},
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment