Feature/onion request refactor #1792
Open
+2,702
−2,153
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ) | ||
|
|
||
| val json = runCatching { | ||
| JsonUtil.fromJson(responseBytes, Map::class.java) |
Collaborator
There was a problem hiding this comment.
I wonder if it makes sense to migrate to use kotlinx serialization here, since we are rebuilding this now
Comment on lines
+26
to
+27
| fun getForkInfo(): ForkInfo | ||
| fun setForkInfo(forkInfo: ForkInfo) |
Collaborator
There was a problem hiding this comment.
What are these used for?
Collaborator
Author
There was a problem hiding this comment.
This is for some work that was performed in the OnionRequest handleResponse before:
if (body.containsKey("hf")) {
@Suppress("UNCHECKED_CAST")
val currentHf = body["hf"] as List<Int>
if (currentHf.size < 2) {
Log.e("Loki", "Response contains fork information but doesn't have a hard and soft number")
} else {
val hf = currentHf[0]
val sf = currentHf[1]
val newForkInfo = ForkInfo(hf, sf)
if (newForkInfo > SnodeAPI.forkInfo) {
SnodeAPI.forkInfo = ForkInfo(hf,sf)
} else if (newForkInfo < SnodeAPI.forkInfo) {
Log.w("Loki", "Got a new snode info fork version that was $newForkInfo, less than current known ${SnodeAPI.forkInfo}")
}
}
}
```
Moved it to a different place for separation of concerns
| if (body == null || body.isEmpty()) return false | ||
|
|
||
| val json: Map<*, *> = try { | ||
| JsonUtil.fromJson(body, Map::class.java) as Map<*, *> |
Collaborator
There was a problem hiding this comment.
Same re: json serialization
app/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt
Show resolved
Hide resolved
| * | ||
| */ | ||
| suspend fun send( | ||
| path: List<Snode>, |
Collaborator
There was a problem hiding this comment.
Since there's a Path type defined, should we use it here too?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP
Early stages of the first networking refactor