Building request json

Author: SessionHero01

library/src/main/cpp/pro_backend.cpp

@@ -6,76 +6,59 @@
 
 using namespace jni_utils;
 
-static jobject serializeMasterRotatingSignatures(
-        JNIEnv *env, const session::pro_backend::MasterRotatingSignatures &sigs) {
-    JavaLocalRef<jclass> result_class(
-            env,
-            env->FindClass(
-                    "network/loki/messenger/libsession_util/pro/BackendRequests$MasterRotatingSignatures"));
-
-    return env->NewObject(
-            result_class.get(),
-            env->GetMethodID(result_class.get(), "<init>", "([B[B)V"),
-            util::bytes_from_span(env, sigs.master_sig),
-            util::bytes_from_span(env, sigs.rotating_sig)
-    );
-}
-
 extern "C"
-JNIEXPORT jobject JNICALL
-Java_network_loki_messenger_libsession_1util_pro_BackendRequests_signAddProPaymentRequest(
+JNIEXPORT jstring JNICALL
+Java_network_loki_messenger_libsession_1util_pro_BackendRequests_buildAddProPaymentRequestJson(
         JNIEnv *env, jobject thiz, jint version, jbyteArray master_private_key,
         jbyteArray rotating_private_key, jint payment_provider, jstring payment_id,
         jstring order_id) {
-    return run_catching_cxx_exception_or_throws<jobject>(env, [=] {
-        auto sigs = session::pro_backend::AddProPaymentRequest::build_sigs(
-                static_cast<std::uint8_t>(version),
+    return run_catching_cxx_exception_or_throws<jstring>(env, [=]() {
+        auto json = session::pro_backend::AddProPaymentRequest::build_to_json(
+                version,
                 JavaByteArrayRef(env, master_private_key).get(),
                 JavaByteArrayRef(env, rotating_private_key).get(),
-                static_cast<SESSION_PRO_BACKEND_PAYMENT_PROVIDER>(
-                        payment_provider),
+                static_cast<SESSION_PRO_BACKEND_PAYMENT_PROVIDER>(payment_provider),
                 JavaStringRef(env, payment_id).get_raw(),
                 JavaStringRef(env, order_id).get_raw());
 
-        return serializeMasterRotatingSignatures(env, sigs);
+        return util::jstringFromOptional(env, json);
     });
 }
 
 extern "C"
-JNIEXPORT jobject JNICALL
-Java_network_loki_messenger_libsession_1util_pro_BackendRequests_signGetProProofRequest(JNIEnv *env,
-                                                                                        jobject thiz,
-                                                                                        jint version,
-                                                                                        jbyteArray master_private_key,
-                                                                                        jbyteArray rotating_private_key,
-                                                                                        jlong unix_ts_ms) {
-    return run_catching_cxx_exception_or_throws<jobject>(env, [=] {
-        auto sigs = session::pro_backend::GetProProofRequest::build_sigs(
+JNIEXPORT jstring JNICALL
+Java_network_loki_messenger_libsession_1util_pro_BackendRequests_buildGetProProofRequestJson(
+        JNIEnv *env, jobject thiz, jint version, jbyteArray master_private_key,
+        jbyteArray rotating_private_key, jlong now_ms) {
+    return run_catching_cxx_exception_or_throws<jstring>(env, [=]() {
+        auto json = session::pro_backend::GetProProofRequest::build_to_json(
                 version,
                 JavaByteArrayRef(env, master_private_key).get(),
                 JavaByteArrayRef(env, rotating_private_key).get(),
-                std::chrono::sys_time<std::chrono::milliseconds>{
-                        std::chrono::milliseconds{unix_ts_ms}}
+                std::chrono::sys_time<std::chrono::milliseconds> {
+                    std::chrono::milliseconds(now_ms)
+                }
         );
 
-        return serializeMasterRotatingSignatures(env, sigs);
+        return util::jstringFromOptional(env, json);
     });
 }
 
 extern "C"
-JNIEXPORT jbyteArray JNICALL
-Java_network_loki_messenger_libsession_1util_pro_BackendRequests_signGetProStatusRequest(
-        JNIEnv *env, jobject thiz, jint version, jbyteArray master_private_key, jlong now_ms,
+JNIEXPORT jstring JNICALL
+Java_network_loki_messenger_libsession_1util_pro_BackendRequests_buildGetProStatusRequestJson(
+        JNIEnv *env, jobject thiz, jint version, jbyteArray pro_master_private_key, jlong now_ms,
         jint count) {
-    return run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
-        auto sig = session::pro_backend::GetProStatusRequest::build_sig(
-                static_cast<std::uint8_t>(version),
-                JavaByteArrayRef(env, master_private_key).get(),
-                std::chrono::sys_time<std::chrono::milliseconds>{
-                        std::chrono::milliseconds{now_ms}},
-                static_cast<std::uint32_t>(count)
+    return run_catching_cxx_exception_or_throws<jstring>(env, [=]() {
+        auto json = session::pro_backend::GetProStatusRequest::build_to_json(
+                version,
+                JavaByteArrayRef(env, pro_master_private_key).get(),
+                std::chrono::sys_time<std::chrono::milliseconds> {
+                    std::chrono::milliseconds(now_ms)
+                },
+                static_cast<uint32_t>(count)
         );
 
-        return util::bytes_from_span(env, sig);
+        return util::jstringFromOptional(env, json);
     });
 }

library/src/main/java/network/loki/messenger/libsession_util/pro/BackendRequests.kt

@@ -1,6 +1,5 @@
 package network.loki.messenger.libsession_util.pro
 
-import androidx.annotation.Keep
 import network.loki.messenger.libsession_util.LibSessionUtilCApi
 
 typealias PaymentProvider = Int
@@ -9,31 +8,26 @@ object BackendRequests : LibSessionUtilCApi() {
     const val PAYMENT_PROVIDER_GOOGLE_PLAY: PaymentProvider = 1
     const val PAYMENT_PROVIDER_APP_STORE: PaymentProvider = 2
 
-    class MasterRotatingSignatures @Keep constructor(
-        val masterSignature: ByteArray,
-        val rotatingSignature: ByteArray,
-    )
-
-    external fun signAddProPaymentRequest(
+    external fun buildAddProPaymentRequestJson(
         version: Int,
         masterPrivateKey: ByteArray,
         rotatingPrivateKey: ByteArray,
         paymentProvider: PaymentProvider,
         paymentId: String,
         orderId: String,
-    ): MasterRotatingSignatures
+    ): String
 
-    external fun signGetProProofRequest(
+    external fun buildGetProProofRequestJson(
         version: Int,
         masterPrivateKey: ByteArray,
         rotatingPrivateKey: ByteArray,
         nowMs: Long,
-    ): MasterRotatingSignatures
+    ): String
 
-    external fun signGetProStatusRequest(
+    external fun buildGetProStatusRequestJson(
         version: Int,
-        masterPrivateKey: ByteArray,
+        proMasterPrivateKey: ByteArray,
         nowMs: Long,
         count: Int,
-    ): ByteArray
+    ): String
 }