Skip to content

Commit 71f46ee

Browse files
SessionHero01SessionHero01
SessionHero01
authored and
SessionHero01
committed
Renamed
1 parent 7b447d3 commit 71f46ee

19 files changed

+138
-133
lines changed

‎library/src/main/cpp/attachments.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Java_network_loki_messenger_libsession_1util_encrypt_Attachments_encryptBytes(JN
5050
);
5151

5252

53-
return util::bytes_from_span(env, std::span(reinterpret_cast<unsigned char *>(key.data()), key.size())).leak();
53+
return util::bytes_from_span(env, std::span(reinterpret_cast<unsigned char *>(key.data()), key.size())).release();
5454
});
5555
}
5656

‎library/src/main/cpp/blinded_key.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionSign(J
3232
session::Platform::android,
3333
timestamp
3434
);
35-
return util::bytes_from_vector(env, bytes).leak();
35+
return util::bytes_from_vector(env, bytes).release();
3636
});
3737
}
3838

@@ -53,7 +53,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionSignRe
5353
jni_utils::JavaStringRef(env, path).view(),
5454
body ? std::make_optional(jni_utils::JavaByteArrayRef(env, body).get()) : std::nullopt
5555
);
56-
return util::bytes_from_vector(env, bytes).leak();
56+
return util::bytes_from_vector(env, bytes).release();
5757
});
5858
}
5959

@@ -84,7 +84,7 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blind15Sign(JNIEnv
8484
jni_utils::JavaStringRef(env, server_pub_key).view(),
8585
jni_utils::JavaByteArrayRef(env, message).get()
8686
);
87-
return util::bytes_from_vector(env, data).leak();
87+
return util::bytes_from_vector(env, data).release();
8888
});
8989
}
9090

@@ -131,6 +131,6 @@ Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blind25Id(JNIEnv *
131131
return jni_utils::jstring_from_optional(env, session::blind25_id(
132132
jni_utils::JavaStringRef(env, session_id).view(),
133133
jni_utils::JavaStringRef(env, server_pub_key).view()
134-
)).leak();
134+
)).release();
135135
});
136136
}

‎library/src/main/cpp/config_base.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ JNIEXPORT jbyteArray JNICALL
9191
Java_network_loki_messenger_libsession_1util_ConfigBase_dump(JNIEnv *env, jobject thiz) {
9292
auto config = ptrToConfigBase(env, thiz);
9393
auto dumped = config->dump();
94-
return util::bytes_from_vector(env, dumped).leak();
94+
return util::bytes_from_vector(env, dumped).release();
9595
}
9696

9797
JNIEXPORT jstring JNICALL

‎library/src/main/cpp/contacts.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#include "contacts.h"
1+
#include <jni.h>
2+
#include <session/config/contacts.hpp>
3+
24
#include "util.h"
35
#include "jni_utils.h"
46

@@ -103,7 +105,7 @@ Java_network_loki_messenger_libsession_1util_Contacts_get(JNIEnv *env, jobject t
103105
auto contacts = ptrToContacts(env, thiz);
104106
auto contact = contacts->get(JavaStringRef(env, account_id).view());
105107
if (!contact) return nullptr;
106-
return serialize_contact(env, contact.value()).leak();
108+
return serialize_contact(env, contact.value()).release();
107109
}
108110
);
109111
}
@@ -115,7 +117,7 @@ Java_network_loki_messenger_libsession_1util_Contacts_getOrConstruct(JNIEnv *env
115117
return run_catching_cxx_exception_or_throws<jobject>(env, [=] {
116118
auto contacts = ptrToContacts(env, thiz);
117119
auto contact = contacts->get_or_construct(JavaStringRef(env, account_id).view());
118-
return serialize_contact(env, contact).leak();
120+
return serialize_contact(env, contact).release();
119121
});
120122
}
121123

@@ -206,7 +208,7 @@ Java_network_loki_messenger_libsession_1util_Contacts_getOrConstructBlinded(JNIE
206208
JavaStringRef(env, community_server_url).view(),
207209
JavaStringRef(env, community_server_pub_key_hex).view(),
208210
JavaStringRef(env, blinded_id).view()
209-
)).leak();
211+
)).release();
210212
}
211213

212214
extern "C"
@@ -247,7 +249,7 @@ Java_network_loki_messenger_libsession_1util_Contacts_getBlinded(JNIEnv *env,
247249
auto result = ptrToContacts(env, thiz)->get_blinded(JavaStringRef(env, blinded_id).view());
248250

249251
if (result) {
250-
return serialize_blinded_contact(env, *result).leak();
252+
return serialize_blinded_contact(env, *result).release();
251253
} else {
252254
return nullptr;
253255
}

‎library/src/main/cpp/contacts.h‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎library/src/main/cpp/conversation.cpp‎

Lines changed: 67 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,19 @@ JavaLocalRef<jobject> serialize_one_to_one(JNIEnv *env, const session::config::c
5050
}
5151

5252
session::config::convo::one_to_one deserialize_one_to_one(JNIEnv *env, jobject info) {
53-
struct ClassInfo {
54-
jclass java_class;
53+
struct ClassInfo : public JavaClassInfo {
5554
jmethodID id_getter;
5655
jmethodID lastRead_getter;
5756
jmethodID unread_getter;
5857

59-
ClassInfo(JNIEnv *env, jclass clazz)
60-
:java_class((jclass) env->NewGlobalRef(clazz)),
61-
id_getter(env->GetMethodID(clazz, "getAccountId", "()Ljava/lang/String;")),
62-
lastRead_getter(env->GetMethodID(clazz, "getLastRead", "()J")),
63-
unread_getter(env->GetMethodID(clazz, "getUnread", "()Z")) {}
58+
ClassInfo(JNIEnv *env, jobject obj)
59+
: JavaClassInfo(env, obj),
60+
id_getter(env->GetMethodID(java_class, "getAccountId", "()Ljava/lang/String;")),
61+
lastRead_getter(env->GetMethodID(java_class, "getLastRead", "()J")),
62+
unread_getter(env->GetMethodID(java_class, "getUnread", "()Z")) {}
6463
};
6564

66-
static ClassInfo class_info(env, JavaLocalRef(env, env->GetObjectClass(info)).get());
65+
static ClassInfo class_info(env, info);
6766

6867
session::config::convo::one_to_one r(
6968
JavaStringRef(
@@ -92,20 +91,19 @@ JavaLocalRef<jobject> serialize_community(JNIEnv *env, const session::config::co
9291
}
9392

9493
session::config::convo::community deserialize_community(JNIEnv *env, jobject info) {
95-
struct ClassInfo {
96-
jclass java_class;
94+
struct ClassInfo : public JavaClassInfo {
9795
jmethodID base_community_getter;
9896
jmethodID last_read_getter;
9997
jmethodID unread_getter;
10098

101-
ClassInfo(JNIEnv *env, jclass clazz)
102-
:java_class((jclass) env->NewGlobalRef(clazz)),
103-
base_community_getter(env->GetMethodID(clazz, "getBaseCommunityInfo", "()Lnetwork/loki/messenger/libsession_util/util/BaseCommunityInfo;")),
104-
last_read_getter(env->GetMethodID(clazz, "getLastRead", "()J")),
105-
unread_getter(env->GetMethodID(clazz, "getUnread", "()Z")) {}
99+
ClassInfo(JNIEnv *env, jobject obj)
100+
: JavaClassInfo(env, obj),
101+
base_community_getter(env->GetMethodID(java_class, "getBaseCommunityInfo", "()Lnetwork/loki/messenger/libsession_util/util/BaseCommunityInfo;")),
102+
last_read_getter(env->GetMethodID(java_class, "getLastRead", "()J")),
103+
unread_getter(env->GetMethodID(java_class, "getUnread", "()Z")) {}
106104
};
107105

108-
static ClassInfo class_info(env, JavaLocalRef(env, env->GetObjectClass(info)).get());
106+
static ClassInfo class_info(env, info);
109107

110108
auto base_community = deserialize_base_community(
111109
env,
@@ -139,20 +137,19 @@ JavaLocalRef<jobject> serialize_legacy_group(JNIEnv *env, const session::config:
139137
}
140138

141139
session::config::convo::legacy_group deserialize_legacy_closed_group(JNIEnv *env, jobject info) {
142-
struct ClassInfo {
143-
jclass java_class;
140+
struct ClassInfo : public JavaClassInfo{
144141
jmethodID groupId_getter;
145142
jmethodID lastRead_getter;
146143
jmethodID unread_getter;
147144

148-
ClassInfo(JNIEnv *env, jclass clazz)
149-
:java_class((jclass) env->NewGlobalRef(clazz)),
150-
groupId_getter(env->GetMethodID(clazz, "getGroupId", "()Ljava/lang/String;")),
151-
lastRead_getter(env->GetMethodID(clazz, "getLastRead", "()J")),
152-
unread_getter(env->GetMethodID(clazz, "getUnread", "()Z")) {}
145+
ClassInfo(JNIEnv *env, jobject obj)
146+
: JavaClassInfo(env, obj),
147+
groupId_getter(env->GetMethodID(java_class, "getGroupId", "()Ljava/lang/String;")),
148+
lastRead_getter(env->GetMethodID(java_class, "getLastRead", "()J")),
149+
unread_getter(env->GetMethodID(java_class, "getUnread", "()Z")) {}
153150
};
154151

155-
static ClassInfo class_info(env, JavaLocalRef(env, env->GetObjectClass(info)).get());
152+
static ClassInfo class_info(env, info);
156153

157154
session::config::convo::legacy_group lg(
158155
JavaStringRef(env, JavaLocalRef(env, static_cast<jstring>(env->CallObjectMethod(info, class_info.groupId_getter))).get()).view()
@@ -177,20 +174,19 @@ JavaLocalRef<jobject> serialize_closed_group(JNIEnv* env, const session::config:
177174
}
178175

179176
session::config::convo::group deserialize_closed_group(JNIEnv* env, jobject info) {
180-
struct ClassInfo {
181-
jclass java_class;
177+
struct ClassInfo : public JavaClassInfo {
182178
jmethodID id_getter;
183179
jmethodID last_read_getter;
184180
jmethodID unread_getter;
185181

186-
ClassInfo(JNIEnv *env, jclass clazz)
187-
:java_class((jclass) env->NewGlobalRef(clazz)),
188-
id_getter(env->GetMethodID(clazz, "getAccountId", "()Ljava/lang/String;")),
189-
last_read_getter(env->GetMethodID(clazz, "getLastRead", "()J")),
190-
unread_getter(env->GetMethodID(clazz, "getUnread", "()Z")) {}
182+
ClassInfo(JNIEnv *env, jobject obj)
183+
:JavaClassInfo(env, obj),
184+
id_getter(env->GetMethodID(java_class, "getAccountId", "()Ljava/lang/String;")),
185+
last_read_getter(env->GetMethodID(java_class, "getLastRead", "()J")),
186+
unread_getter(env->GetMethodID(java_class, "getUnread", "()Z")) {}
191187
};
192188

193-
static ClassInfo class_info(env, JavaLocalRef(env, env->GetObjectClass(info)).get());
189+
static ClassInfo class_info(env, info);
194190

195191
session::config::convo::group g(
196192
JavaStringRef(env, JavaLocalRef(env, (jstring) env->CallObjectMethod(info, class_info.id_getter)).get()).view());
@@ -212,25 +208,25 @@ JavaLocalRef<jobject> serialize_blinded_one_to_one(JNIEnv *env, const session::c
212208
class_info.constructor,
213209
JavaLocalRef(env, env->NewStringUTF(blinded_one_to_one.blinded_session_id.data())).get(),
214210
(jlong) blinded_one_to_one.last_read,
215-
(jboolean) blinded_one_to_one.unread
211+
(jboolean) blinded_one_to_one.unread,
212+
serialize_pro_proof_info(env, blinded_one_to_one.pro_gen_index_hash, blinded_one_to_one.pro_expiry_unix_ts).get()
216213
)};
217214
}
218215

219216
session::config::convo::blinded_one_to_one deserialize_blinded_one_to_one(JNIEnv *env, jobject info) {
220-
struct ClassInfo {
221-
jclass java_class;
217+
struct ClassInfo : public JavaClassInfo {
222218
jmethodID id_getter;
223219
jmethodID last_read_getter;
224220
jmethodID unread_getter;
225221

226-
ClassInfo(JNIEnv *env, jclass clazz)
227-
:java_class((jclass) env->NewGlobalRef(clazz)),
228-
id_getter(env->GetMethodID(clazz, "getBlindedAccountId", "()Ljava/lang/String;")),
229-
last_read_getter(env->GetMethodID(clazz, "getLastRead", "()J")),
230-
unread_getter(env->GetMethodID(clazz, "getUnread", "()Z")) {}
222+
ClassInfo(JNIEnv *env, jobject obj)
223+
: JavaClassInfo(env, obj),
224+
id_getter(env->GetMethodID(java_class, "getBlindedAccountId", "()Ljava/lang/String;")),
225+
last_read_getter(env->GetMethodID(java_class, "getLastRead", "()J")),
226+
unread_getter(env->GetMethodID(java_class, "getUnread", "()Z")) {}
231227
};
232228

233-
static ClassInfo class_info(env, JavaLocalRef(env, env->GetObjectClass(info)).get());
229+
static ClassInfo class_info(env, info);
234230

235231
session::config::convo::blinded_one_to_one r(
236232
JavaStringRef(env, JavaLocalRef(env, (jstring) env->CallObjectMethod(info, class_info.id_getter)).get()).view());
@@ -322,7 +318,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getOneTo
322318
auto convos = ptrToConvoInfo(env, thiz);
323319
auto internal = convos->get_1to1(JavaStringRef(env, pub_key_hex).view());
324320
if (internal) {
325-
return serialize_one_to_one(env, *internal).leak();
321+
return serialize_one_to_one(env, *internal).release();
326322
}
327323
return nullptr;
328324
}
@@ -331,7 +327,7 @@ JNIEXPORT jobject JNICALL
331327
Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getOrConstructOneToOne(
332328
JNIEnv *env, jobject thiz, jstring pub_key_hex) {
333329
auto convos = ptrToConvoInfo(env, thiz);
334-
return serialize_one_to_one(env, convos->get_or_construct_1to1(JavaStringRef(env, pub_key_hex).view())).leak();
330+
return serialize_one_to_one(env, convos->get_or_construct_1to1(JavaStringRef(env, pub_key_hex).view())).release();
335331
}
336332
extern "C"
337333
JNIEXPORT jboolean JNICALL
@@ -349,7 +345,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getCommu
349345
auto convos = ptrToConvoInfo(env, thiz);
350346
auto open = convos->get_community(JavaStringRef(env, base_url).view(), JavaStringRef(env, room).view());
351347
if (open) {
352-
return serialize_community(env, *open).leak();
348+
return serialize_community(env, *open).release();
353349
}
354350
return nullptr;
355351
}
@@ -362,7 +358,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getOrCon
362358
JavaStringRef(env, base_url).view(),
363359
JavaStringRef(env, room).view(),
364360
JavaByteArrayRef(env, pub_key).get());
365-
return serialize_community(env, community).leak();
361+
return serialize_community(env, community).release();
366362
}
367363
extern "C"
368364
JNIEXPORT jobject JNICALL
@@ -373,7 +369,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getOrCon
373369
JavaStringRef(env, base_url).view(),
374370
JavaStringRef(env, room).view(),
375371
JavaStringRef(env, pub_key_hex).view());
376-
return serialize_community(env, community).leak();
372+
return serialize_community(env, community).release();
377373
}
378374
extern "C"
379375
JNIEXPORT jboolean JNICALL
@@ -400,7 +396,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getLegac
400396
auto convos = ptrToConvoInfo(env, thiz);
401397
auto lgc = convos->get_legacy_group(JavaStringRef(env, group_id).view());
402398
if (lgc) {
403-
return serialize_legacy_group(env, *lgc).leak();
399+
return serialize_legacy_group(env, *lgc).release();
404400
}
405401

406402
return nullptr;
@@ -411,7 +407,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getOrCon
411407
JNIEnv *env, jobject thiz, jstring group_id) {
412408
auto convos = ptrToConvoInfo(env, thiz);
413409
auto lgc = convos->get_or_construct_legacy_group(JavaStringRef(env, group_id).view());
414-
return serialize_legacy_group(env, lgc).leak();
410+
return serialize_legacy_group(env, lgc).release();
415411
}
416412
extern "C"
417413
JNIEXPORT jboolean JNICALL
@@ -494,7 +490,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getClose
494490
auto config = ptrToConvoInfo(env, thiz);
495491
auto group = config->get_group(JavaStringRef(env, session_id).view());
496492
if (group) {
497-
return serialize_closed_group(env, *group).leak();
493+
return serialize_closed_group(env, *group).release();
498494
}
499495
return nullptr;
500496
}
@@ -505,7 +501,7 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getOrCon
505501
JNIEnv *env, jobject thiz, jstring session_id) {
506502
auto config = ptrToConvoInfo(env, thiz);
507503
auto group = config->get_or_construct_group(JavaStringRef(env, session_id).view());
508-
return serialize_closed_group(env, group).leak();
504+
return serialize_closed_group(env, group).release();
509505
}
510506

511507
extern "C"
@@ -567,3 +563,24 @@ Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_eraseBli
567563
return ptrToConvoInfo(env, thiz)->erase_blinded_1to1(JavaStringRef(env, blinded_id).view());
568564
}
569565

566+
extern "C"
567+
JNIEXPORT jobject JNICALL
568+
Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_getBlindedOneToOne(
569+
JNIEnv *env, jobject thiz, jstring pub_key_hex) {
570+
auto blinded = ptrToConvoInfo(env, thiz)->get_blinded_1to1(JavaStringRef(env, pub_key_hex).view());
571+
if (blinded) {
572+
return serialize_blinded_one_to_one(env, *blinded).release();
573+
}
574+
return nullptr;
575+
}
576+
577+
extern "C"
578+
JNIEXPORT jobject JNICALL
579+
Java_network_loki_messenger_libsession_1util_ConversationVolatileConfig_allBlindedOneToOnes(
580+
JNIEnv *env, jobject thiz) {
581+
auto convo = ptrToConvoInfo(env, thiz);
582+
return jlist_from_iterator(env,
583+
convo->begin_blinded_1to1(),
584+
convo->end(),
585+
serialize_blinded_one_to_one);
586+
}

‎library/src/main/cpp/curve25519.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Java_network_loki_messenger_libsession_1util_Curve25519_pubKeyFromED25519(JNIEnv
2323
jbyteArray ed25519_public_key) {
2424
return jni_utils::run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
2525
auto pk = session::curve25519::to_curve25519_pubkey(jni_utils::JavaByteArrayRef(env, ed25519_public_key).get());
26-
return util::bytes_from_span(env, pk).leak();
26+
return util::bytes_from_span(env, pk).release();
2727
});
2828
}
2929

‎library/src/main/cpp/ed25519.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Java_network_loki_messenger_libsession_1util_ED25519_sign(JNIEnv *env, jobject t
1414
jni_utils::JavaByteArrayRef(env, ed25519_private_key).get(),
1515
jni_utils::JavaByteArrayRef(env, message).get());
1616

17-
return util::bytes_from_vector(env, sigs).leak();
17+
return util::bytes_from_vector(env, sigs).release();
1818
});
1919
}
2020

@@ -56,7 +56,7 @@ Java_network_loki_messenger_libsession_1util_ED25519_generateProMasterKey(JNIEnv
5656
session::ed25519::ed25519_pro_privkey_for_ed25519_seed(
5757
jni_utils::JavaByteArrayRef(env, ed25519_seed).get()
5858
)
59-
).leak();
59+
).release();
6060
});
6161
}
6262

@@ -69,6 +69,6 @@ Java_network_loki_messenger_libsession_1util_ED25519_positiveEd25519PubKeyFromCu
6969
env,
7070
session::xed25519::pubkey(
7171
jni_utils::JavaByteArrayRef(env, curve25519_pub_key).get())
72-
).leak();
72+
).release();
7373
});
7474
}

0 commit comments

Comments
 (0)