Skip to content

Commit 9b42ac6

Browse files
SessionHero01SessionHero01
SessionHero01
authored and
SessionHero01
committed
Remove unused mutex
1 parent b9fd7bb commit 9b42ac6

File tree

10 files changed

+1
-96
lines changed

10 files changed

+1
-96
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,25 @@
55
extern "C" {
66
JNIEXPORT jboolean JNICALL
77
Java_network_loki_messenger_libsession_1util_ConfigBase_dirty(JNIEnv *env, jobject thiz) {
8-
std::lock_guard lock{util::util_mutex_};
98
auto* configBase = ptrToConfigBase(env, thiz);
109
return configBase->is_dirty();
1110
}
1211

1312
JNIEXPORT jboolean JNICALL
1413
Java_network_loki_messenger_libsession_1util_ConfigBase_needsPush(JNIEnv *env, jobject thiz) {
15-
std::lock_guard lock{util::util_mutex_};
1614
auto config = ptrToConfigBase(env, thiz);
1715
return config->needs_push();
1816
}
1917

2018
JNIEXPORT jboolean JNICALL
2119
Java_network_loki_messenger_libsession_1util_ConfigBase_needsDump(JNIEnv *env, jobject thiz) {
22-
std::lock_guard lock{util::util_mutex_};
2320
auto config = ptrToConfigBase(env, thiz);
2421
return config->needs_dump();
2522
}
2623

2724
JNIEXPORT jobject JNICALL
2825
Java_network_loki_messenger_libsession_1util_ConfigBase_push(JNIEnv *env, jobject thiz) {
2926
return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
30-
std::lock_guard lock{util::util_mutex_};
3127
auto config = ptrToConfigBase(env, thiz);
3228
auto [seq_no, to_push, to_delete] = config->push();
3329

@@ -51,7 +47,6 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_free(JNIEnv *env, jobjec
5147

5248
JNIEXPORT jbyteArray JNICALL
5349
Java_network_loki_messenger_libsession_1util_ConfigBase_dump(JNIEnv *env, jobject thiz) {
54-
std::lock_guard lock{util::util_mutex_};
5550
auto config = ptrToConfigBase(env, thiz);
5651
auto dumped = config->dump();
5752
jbyteArray bytes = util::bytes_from_vector(env, dumped);
@@ -69,7 +64,6 @@ JNIEXPORT void JNICALL
6964
Java_network_loki_messenger_libsession_1util_ConfigBase_confirmPushed(JNIEnv *env, jobject thiz,
7065
jlong seq_no,
7166
jobjectArray hash_list) {
72-
std::lock_guard lock{util::util_mutex_};
7367
auto conf = ptrToConfigBase(env, thiz);
7468
auto hash_list_size = env->GetArrayLength(hash_list);
7569
std::unordered_set<std::string> hashes(hash_list_size);
@@ -88,7 +82,6 @@ JNIEXPORT jobject JNICALL
8882
Java_network_loki_messenger_libsession_1util_ConfigBase_merge___3Lkotlin_Pair_2(JNIEnv *env, jobject thiz,
8983
jobjectArray to_merge) {
9084
return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
91-
std::lock_guard lock{util::util_mutex_};
9285
auto conf = ptrToConfigBase(env, thiz);
9386
size_t number = env->GetArrayLength(to_merge);
9487
std::vector<std::pair<std::string, std::vector<unsigned char>>> configs = {};
@@ -135,7 +128,6 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_00024Companion_kindFor(J
135128
extern "C"
136129
JNIEXPORT jobject JNICALL
137130
Java_network_loki_messenger_libsession_1util_ConfigBase_activeHashes(JNIEnv *env, jobject thiz) {
138-
std::lock_guard lock{util::util_mutex_};
139131
auto conf = ptrToConfigBase(env, thiz);
140132
return jni_utils::jstring_list_from_collection(env, conf->active_hashes());
141133
}

‎library/src/main/cpp/config_common.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Java_network_loki_messenger_libsession_1util_ConfigKt_createConfigObject(
2323
: std::nullopt;
2424

2525

26-
std::lock_guard lock{util::util_mutex_};
2726
if (config_name.view() == "Contacts") {
2827
return reinterpret_cast<jlong>(new session::config::Contacts(secret_key.get(), initial));
2928
} else if (config_name.view() == "UserProfile") {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Java_network_loki_messenger_libsession_1util_Contacts_get(JNIEnv *env, jobject t
1515
// If an exception is thrown, return nullptr
1616
return jni_utils::run_catching_cxx_exception_or<jobject>(
1717
[=]() -> jobject {
18-
std::lock_guard lock{util::util_mutex_};
1918
auto contacts = ptrToContacts(env, thiz);
2019
auto contact = contacts->get(jni_utils::JavaStringRef(env, account_id).view());
2120
if (!contact) return nullptr;
@@ -31,7 +30,6 @@ JNIEXPORT jobject JNICALL
3130
Java_network_loki_messenger_libsession_1util_Contacts_getOrConstruct(JNIEnv *env, jobject thiz,
3231
jstring account_id) {
3332
return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
34-
std::lock_guard lock{util::util_mutex_};
3533
auto contacts = ptrToContacts(env, thiz);
3634
auto contact = contacts->get_or_construct(jni_utils::JavaStringRef(env, account_id).view());
3735
return serialize_contact(env, contact);
@@ -43,7 +41,6 @@ JNIEXPORT void JNICALL
4341
Java_network_loki_messenger_libsession_1util_Contacts_set(JNIEnv *env, jobject thiz,
4442
jobject contact) {
4543
jni_utils::run_catching_cxx_exception_or_throws<void>(env, [=] {
46-
std::lock_guard lock{util::util_mutex_};
4744
auto contacts = ptrToContacts(env, thiz);
4845
auto contact_info = deserialize_contact(env, contact, contacts);
4946
contacts->set(contact_info);
@@ -55,7 +52,6 @@ JNIEXPORT jboolean JNICALL
5552
Java_network_loki_messenger_libsession_1util_Contacts_erase(JNIEnv *env, jobject thiz,
5653
jstring account_id) {
5754
return jni_utils::run_catching_cxx_exception_or_throws<jboolean>(env, [=] {
58-
std::lock_guard lock{util::util_mutex_};
5955
auto contacts = ptrToContacts(env, thiz);
6056
bool result = contacts->erase(jni_utils::JavaStringRef(env, account_id).view());
6157
return result;
@@ -66,7 +62,6 @@ extern "C"
6662
JNIEXPORT jobject JNICALL
6763
Java_network_loki_messenger_libsession_1util_Contacts_all(JNIEnv *env, jobject thiz) {
6864
return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
69-
std::lock_guard lock{util::util_mutex_};
7065
return jni_utils::jlist_from_collection(env, *ptrToContacts(env, thiz), serialize_contact);
7166
});
7267
}

‎library/src/main/cpp/group_info.cpp‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Java_network_loki_messenger_libsession_1util_GroupInfoConfig_00024Companion_newI
99
jbyteArray pub_key,
1010
jbyteArray secret_key,
1111
jbyteArray initial_dump) {
12-
std::lock_guard guard{util::util_mutex_};
1312
std::optional<std::vector<unsigned char>> secret_key_optional{std::nullopt};
1413
std::optional<std::vector<unsigned char>> initial_dump_optional{std::nullopt};
1514
auto pub_key_bytes = util::vector_from_bytes(env, pub_key);
@@ -30,7 +29,6 @@ extern "C"
3029
JNIEXPORT void JNICALL
3130
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_destroyGroup(JNIEnv *env,
3231
jobject thiz) {
33-
std::lock_guard guard{util::util_mutex_};
3432
auto group_info = ptrToInfo(env, thiz);
3533
group_info->destroy_group();
3634
}
@@ -39,23 +37,20 @@ Java_network_loki_messenger_libsession_1util_GroupInfoConfig_destroyGroup(JNIEnv
3937
extern "C"
4038
JNIEXPORT jobject JNICALL
4139
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getCreated(JNIEnv *env, jobject thiz) {
42-
std::lock_guard guard{util::util_mutex_};
4340
auto group_info = ptrToInfo(env, thiz);
4441
return util::jlongFromOptional(env, group_info->get_created());
4542
}
4643
extern "C"
4744
JNIEXPORT jobject JNICALL
4845
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getDeleteAttachmentsBefore(JNIEnv *env,
4946
jobject thiz) {
50-
std::lock_guard guard{util::util_mutex_};
5147
auto group_info = ptrToInfo(env, thiz);
5248
return util::jlongFromOptional(env, group_info->get_delete_attach_before());
5349
}
5450
extern "C"
5551
JNIEXPORT jobject JNICALL
5652
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getDeleteBefore(JNIEnv *env,
5753
jobject thiz) {
58-
std::lock_guard guard{util::util_mutex_};
5954
auto group_info = ptrToInfo(env, thiz);
6055
return util::jlongFromOptional(env, group_info->get_delete_before());
6156
}
@@ -64,7 +59,6 @@ extern "C"
6459
JNIEXPORT jlong JNICALL
6560
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getExpiryTimer(JNIEnv *env,
6661
jobject thiz) {
67-
std::lock_guard guard{util::util_mutex_};
6862
auto group_info = ptrToInfo(env, thiz);
6963
auto timer = group_info->get_expiry_timer();
7064
if (!timer) {
@@ -77,7 +71,6 @@ Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getExpiryTimer(JNIE
7771
extern "C"
7872
JNIEXPORT jstring JNICALL
7973
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getName(JNIEnv *env, jobject thiz) {
80-
std::lock_guard guard{util::util_mutex_};
8174
auto group_info = ptrToInfo(env, thiz);
8275
return util::jstringFromOptional(env, group_info->get_name());
8376
}
@@ -86,7 +79,6 @@ extern "C"
8679
JNIEXPORT jobject JNICALL
8780
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getProfilePic(JNIEnv *env,
8881
jobject thiz) {
89-
std::lock_guard guard{util::util_mutex_};
9082
auto group_info = ptrToInfo(env, thiz);
9183
return util::serialize_user_pic(env, group_info->get_profile_pic());
9284
}
@@ -95,7 +87,6 @@ extern "C"
9587
JNIEXPORT jboolean JNICALL
9688
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_isDestroyed(JNIEnv *env,
9789
jobject thiz) {
98-
std::lock_guard guard{util::util_mutex_};
9990
auto group_info = ptrToInfo(env, thiz);
10091
return group_info->is_destroyed();
10192
}
@@ -104,7 +95,6 @@ extern "C"
10495
JNIEXPORT void JNICALL
10596
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_setCreated(JNIEnv *env, jobject thiz,
10697
jlong created_at) {
107-
std::lock_guard guard{util::util_mutex_};
10898
auto group_info = ptrToInfo(env, thiz);
10999
group_info->set_created(created_at);
110100
}
@@ -114,7 +104,6 @@ JNIEXPORT void JNICALL
114104
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_setDeleteAttachmentsBefore(JNIEnv *env,
115105
jobject thiz,
116106
jlong delete_before) {
117-
std::lock_guard guard{util::util_mutex_};
118107
auto group_info = ptrToInfo(env, thiz);
119108
group_info->set_delete_attach_before(delete_before);
120109
}
@@ -124,7 +113,6 @@ JNIEXPORT void JNICALL
124113
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_setDeleteBefore(JNIEnv *env,
125114
jobject thiz,
126115
jlong delete_before) {
127-
std::lock_guard guard{util::util_mutex_};
128116
auto group_info = ptrToInfo(env, thiz);
129117
group_info->set_delete_before(delete_before);
130118
}
@@ -134,7 +122,6 @@ JNIEXPORT void JNICALL
134122
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_setExpiryTimer(JNIEnv *env,
135123
jobject thiz,
136124
jlong expire_seconds) {
137-
std::lock_guard guard{util::util_mutex_};
138125
auto group_info = ptrToInfo(env, thiz);
139126
group_info->set_expiry_timer(std::chrono::seconds{expire_seconds});
140127
}
@@ -143,7 +130,6 @@ extern "C"
143130
JNIEXPORT void JNICALL
144131
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_setName(JNIEnv *env, jobject thiz,
145132
jstring new_name) {
146-
std::lock_guard guard{util::util_mutex_};
147133
auto group_info = ptrToInfo(env, thiz);
148134
group_info->set_name(jni_utils::JavaStringRef(env, new_name).view());
149135
}
@@ -153,7 +139,6 @@ JNIEXPORT void JNICALL
153139
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_setProfilePic(JNIEnv *env,
154140
jobject thiz,
155141
jobject new_profile_pic) {
156-
std::lock_guard guard{util::util_mutex_};
157142
auto group_info = ptrToInfo(env, thiz);
158143
group_info->set_profile_pic(util::deserialize_user_pic(env, new_profile_pic));
159144
}
@@ -162,15 +147,13 @@ extern "C"
162147
JNIEXPORT jlong JNICALL
163148
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_storageNamespace(JNIEnv *env,
164149
jobject thiz) {
165-
std::lock_guard guard{util::util_mutex_};
166150
auto group_info = ptrToInfo(env, thiz);
167151
return static_cast<jlong>(group_info->storage_namespace());
168152
}
169153

170154
extern "C"
171155
JNIEXPORT jstring JNICALL
172156
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_id(JNIEnv *env, jobject thiz) {
173-
std::lock_guard guard{util::util_mutex_};
174157
auto group_info = ptrToInfo(env, thiz);
175158
return util::jstringFromOptional(env, group_info->id);
176159
}
@@ -179,7 +162,6 @@ extern "C"
179162
JNIEXPORT jstring JNICALL
180163
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_getDescription(JNIEnv *env,
181164
jobject thiz) {
182-
std::lock_guard guard{util::util_mutex_};
183165
auto group_info = ptrToInfo(env, thiz);
184166
auto description = group_info->get_description();
185167
if (!description) {
@@ -194,7 +176,6 @@ JNIEXPORT void JNICALL
194176
Java_network_loki_messenger_libsession_1util_GroupInfoConfig_setDescription(JNIEnv *env,
195177
jobject thiz,
196178
jstring new_description) {
197-
std::lock_guard guard{util::util_mutex_};
198179
auto group_info = ptrToInfo(env, thiz);
199180
group_info->set_description(jni_utils::JavaStringRef(env, new_description).view());
200181
}

0 commit comments

Comments
 (0)