Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only set app version on Client init #144

Merged
merged 3 commits into from
Aug 7, 2023
Merged

Only set app version on Client init #144

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
115e9ad
only set it on client init
nplasterer Aug 4, 2023
570dc1c
don't need to store the app version in swift
nplasterer Aug 7, 2023
6a9fe93
Merge branch 'main' of https://github.com/xmtp/xmtp-ios into np/set-a…
nplasterer Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Sources/XMTP/ApiClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,13 @@ class GRPCApiClient: ApiClient {
var authToken = ""

var rustClient: XMTPRust.RustClient
var appVersion: String

required init(environment: XMTPEnvironment, secure _: Bool = true, rustClient: XMTPRust.RustClient, appVersion: String? = nil) throws {
self.environment = environment
self.rustClient = rustClient
self.appVersion = appVersion ?? "0.0.0"
if let appVersion = appVersion {
rustClient.set_app_version(appVersion.intoRustString())
}
}

static func envToUrl(env: XMTPEnvironment) -> String {
Expand All @@ -89,7 +90,6 @@ class GRPCApiClient: ApiClient {

func batchQuery(request: BatchQueryRequest) async throws -> BatchQueryResponse {
do {
rustClient.set_app_version(appVersion.intoRustString())
let req = RustVec<UInt8>(try request.serializedData())
let res: RustVec<UInt8> = try await rustClient.batch_query(req)
return try BatchQueryResponse(serializedData: Data(res))
Expand All @@ -100,7 +100,6 @@ class GRPCApiClient: ApiClient {

func query(request: QueryRequest) async throws -> QueryResponse {
do {
rustClient.set_app_version(appVersion.intoRustString())
let req = RustVec<UInt8>(try request.serializedData())
let res: RustVec<UInt8> = try await rustClient.query(req)
return try QueryResponse(serializedData: Data(res))
Expand Down Expand Up @@ -142,7 +141,6 @@ class GRPCApiClient: ApiClient {
func subscribe(topics: [String]) -> AsyncThrowingStream<Envelope, Error> {
return AsyncThrowingStream { continuation in
Task {
rustClient.set_app_version(appVersion.intoRustString())
let request = SubscribeRequest.with { $0.contentTopics = topics }
let req = RustVec<UInt8>(try request.serializedData())
do {
Expand All @@ -166,7 +164,6 @@ class GRPCApiClient: ApiClient {

func publish(request: PublishRequest) async throws -> PublishResponse {
do {
rustClient.set_app_version(appVersion.intoRustString())
let req = RustVec<UInt8>(try request.serializedData())
let res: RustVec<UInt8> = try await rustClient.publish(authToken.intoRustString(), req)
return try PublishResponse(serializedData: Data(res))
Expand Down