Tidy up

Author: SessionHero01

library/src/main/cpp/config_base.cpp

@@ -96,34 +96,6 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_merge___3Lkotlin_Pair_2(
 
 #pragma clang diagnostic pop
 }
-extern "C"
-JNIEXPORT jint JNICALL
-Java_network_loki_messenger_libsession_1util_ConfigBase_configNamespace(JNIEnv *env, jobject thiz) {
-    auto conf = ptrToConfigBase(env, thiz);
-    return (std::int16_t) conf->storage_namespace();
-}
-extern "C"
-JNIEXPORT jclass JNICALL
-Java_network_loki_messenger_libsession_1util_ConfigBase_00024Companion_kindFor(JNIEnv *env,
-                                                                               jobject thiz,
-                                                                               jint config_namespace) {
-    auto user_class = env->FindClass("network/loki/messenger/libsession_util/UserProfile");
-    auto contact_class = env->FindClass("network/loki/messenger/libsession_util/Contacts");
-    auto convo_volatile_class = env->FindClass("network/loki/messenger/libsession_util/ConversationVolatileConfig");
-    auto group_list_class = env->FindClass("network/loki/messenger/libsession_util/UserGroupsConfig");
-    switch (config_namespace) {
-        case (int)session::config::Namespace::UserProfile:
-            return user_class;
-        case (int)session::config::Namespace::Contacts:
-            return contact_class;
-        case (int)session::config::Namespace::ConvoInfoVolatile:
-            return convo_volatile_class;
-        case (int)session::config::Namespace::UserGroups:
-            return group_list_class;
-        default:
-            return nullptr;
-    }
-}
 
 extern "C"
 JNIEXPORT jobject JNICALL

library/src/main/java/network/loki/messenger/libsession_util/Config.kt

@@ -12,6 +12,12 @@ import network.loki.messenger.libsession_util.util.GroupInfo
 import network.loki.messenger.libsession_util.util.GroupMember
 import network.loki.messenger.libsession_util.util.UserPic
 
+typealias ConversationPriority = Long
+
+const val PRIORITY_HIDDEN: ConversationPriority = -1L
+const val PRIORITY_VISIBLE: ConversationPriority = 0L
+const val PRIORITY_PINNED: ConversationPriority = 1L
+
 sealed class Config(initialPointer: Long): LibSessionUtilCApi() {
     var pointer = initialPointer
         private set
@@ -72,7 +78,7 @@ interface ReadableUserProfile: ReadableConfig {
     fun getName(): String?
     fun getPic(): UserPic
     fun getProfileUpdatedSeconds(): Long
-    fun getNtsPriority(): Long
+    fun getNtsPriority(): ConversationPriority
     fun getNtsExpiry(): ExpiryMode
     fun getCommunityMessageRequests(): Boolean
     fun isBlockCommunityMessageRequestsSet(): Boolean
@@ -94,7 +100,7 @@ interface MutableUserProfile : ReadableUserProfile, MutableConfig {
      * Called when setting a re-uploaded pic
      */
     fun setReuploadedPic(userPic: UserPic)
-    fun setNtsPriority(priority: Long)
+    fun setNtsPriority(priority: ConversationPriority)
     fun setNtsExpiry(expiryMode: ExpiryMode)
     fun setCommunityMessageRequests(blocks: Boolean)
 

library/src/main/java/network/loki/messenger/libsession_util/ConfigBase.kt

@@ -3,18 +3,6 @@ package network.loki.messenger.libsession_util
 import network.loki.messenger.libsession_util.util.ConfigPush
 
 sealed class ConfigBase(pointer: Long): Config(pointer), MutableConfig {
-    companion object {
-        init {
-            System.loadLibrary("session_util")
-        }
-        external fun kindFor(configNamespace: Int): Class<ConfigBase>
-
-        const val PRIORITY_HIDDEN = -1L
-        const val PRIORITY_VISIBLE = 0L
-        const val PRIORITY_PINNED = 1L
-
-    }
-
     external override fun dirty(): Boolean
     external override fun needsPush(): Boolean
     external override fun needsDump(): Boolean

library/src/main/java/network/loki/messenger/libsession_util/util/BlindedContact.kt

@@ -1,5 +1,7 @@
 package network.loki.messenger.libsession_util.util
 
+import network.loki.messenger.libsession_util.ConversationPriority
+
 data class BlindedContact(
     val id: String,
     val communityServer: String,
@@ -8,7 +10,7 @@ data class BlindedContact(
     var createdEpochSeconds: Long,
     var profileUpdatedEpochSeconds: Long,
     var profilePic: UserPic,
-    var priority: Long,
+    var priority: ConversationPriority,
 ) {
     @OptIn(ExperimentalStdlibApi::class)
     val communityServerPubKey: ByteArray

library/src/main/java/network/loki/messenger/libsession_util/util/Contact.kt

@@ -1,5 +1,8 @@
 package network.loki.messenger.libsession_util.util
 
+import network.loki.messenger.libsession_util.ConversationPriority
+import network.loki.messenger.libsession_util.PRIORITY_VISIBLE
+
 data class Contact(
     val id: String,
     var name: String = "",
@@ -10,7 +13,7 @@ data class Contact(
     var profilePicture: UserPic = UserPic.DEFAULT,
     var createdEpochSeconds: Long = 0,
     var profileUpdatedEpochSeconds: Long = 0,
-    var priority: Long = 0,
+    var priority: ConversationPriority = PRIORITY_VISIBLE,
     var expiryMode: ExpiryMode = ExpiryMode.NONE,
 ) {
     val displayName: String