cleanup: Remove deprecated group reconnect API.

Author: iphydf

lib/src/main/cpp/ToxCore/friendlist.cpp

@@ -552,21 +552,6 @@ JNIEXPORT jint JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_toxConferenceById
 JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_toxConferenceGetUid
   (JNIEnv *env, jclass, jint instanceNumber, jint conferenceNumber);
 
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    toxConferenceByUid
- * Signature: (I[B)I
- */
-JNIEXPORT jint JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_toxConferenceByUid
-  (JNIEnv *env, jclass, jint instanceNumber, jbyteArray uid)
-{
-  auto uidData = fromJavaArray (env, uid);
-  return instances.with_instance_err (env, instanceNumber,
-    identity,
-    tox_conference_by_uid, uidData.data ()
-  );
-}
-
 /*
  * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
  * Method:    toxGroupNew
@@ -628,19 +613,6 @@ JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_toxGroupDisconnect
   );
 }
 
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    toxGroupReconnect
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_toxGroupReconnect
-  (JNIEnv *env, jclass, jint instanceNumber, jint groupNumber)
-{
-  return instances.with_instance_ign (env, instanceNumber,
-    tox_group_reconnect, groupNumber
-  );
-}
-
 /*
  * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
  * Method:    toxGroupLeave

lib/src/main/cpp/ToxCore/generated/errors.cpp

@@ -279,6 +279,7 @@ HANDLE ("ConferenceJoin", Conference_Join)
     failure_case (CONFERENCE_JOIN, INIT_FAIL);
     failure_case (CONFERENCE_JOIN, INVALID_LENGTH);
     failure_case (CONFERENCE_JOIN, WRONG_TYPE);
+    failure_case (CONFERENCE_JOIN, NULL);
     }
   return unhandled ();
 }
@@ -329,17 +330,6 @@ HANDLE ("ConferenceById", Conference_By_Id)
   return unhandled ();
 }
 
-HANDLE ("ConferenceByUid", Conference_By_Uid)
-{
-  switch (error)
-    {
-    success_case (CONFERENCE_BY_UID);
-    failure_case (CONFERENCE_BY_UID, NULL);
-    failure_case (CONFERENCE_BY_UID, NOT_FOUND);
-    }
-  return unhandled ();
-}
-
 HANDLE ("GroupNew", Group_New)
 {
   switch (error)
@@ -390,17 +380,6 @@ HANDLE ("GroupDisconnect", Group_Disconnect)
   return unhandled ();
 }
 
-HANDLE ("GroupReconnect", Group_Reconnect)
-{
-  switch (error)
-    {
-    success_case (GROUP_RECONNECT);
-    failure_case (GROUP_RECONNECT, CORE);
-    failure_case (GROUP_RECONNECT, GROUP_NOT_FOUND);
-    }
-  return unhandled ();
-}
-
 HANDLE ("GroupLeave", Group_Leave)
 {
   switch (error)
@@ -571,6 +550,7 @@ HANDLE ("GroupInviteAccept", Group_Invite_Accept)
     failure_case (GROUP_INVITE_ACCEPT, INIT_FAILED);
     failure_case (GROUP_INVITE_ACCEPT, PASSWORD);
     failure_case (GROUP_INVITE_ACCEPT, TOO_LONG);
+    failure_case (GROUP_INVITE_ACCEPT, NULL);
     }
   return unhandled ();
 }

lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h

@@ -11,7 +11,6 @@ import im.tox.tox4j.core.data.ToxConferenceOfflinePeerNumber
 import im.tox.tox4j.core.data.ToxConferencePeerName
 import im.tox.tox4j.core.data.ToxConferencePeerNumber
 import im.tox.tox4j.core.data.ToxConferenceTitle
-import im.tox.tox4j.core.data.ToxConferenceUid
 import im.tox.tox4j.core.data.ToxFileId
 import im.tox.tox4j.core.data.ToxFilename
 import im.tox.tox4j.core.data.ToxFriendAddress
@@ -376,12 +375,6 @@ final class ToxCoreImpl(
     override fun conferenceById(conferenceId: ToxConferenceId): ToxConferenceNumber =
         ToxConferenceNumber(ToxCoreJni.toxConferenceById(instanceNumber, conferenceId.value))
 
-    override fun conferenceGetUid(conferenceNumber: ToxConferenceNumber): ToxConferenceUid =
-        ToxConferenceUid(ToxCoreJni.toxConferenceGetUid(instanceNumber, conferenceNumber.value))
-
-    override fun conferenceByUid(conferenceUid: ToxConferenceUid): ToxConferenceNumber =
-        ToxConferenceNumber(ToxCoreJni.toxConferenceByUid(instanceNumber, conferenceUid.value))
-
     override fun groupNew(
         privacyState: ToxGroupPrivacyState,
         groupName: ToxGroupName,
@@ -409,8 +402,6 @@ final class ToxCoreImpl(
 
     override fun groupDisconnect(groupNumber: ToxGroupNumber): Unit = ToxCoreJni.toxGroupDisconnect(instanceNumber, groupNumber.value)
 
-    override fun groupReconnect(groupNumber: ToxGroupNumber): Unit = ToxCoreJni.toxGroupReconnect(instanceNumber, groupNumber.value)
-
     override fun groupLeave(
         groupNumber: ToxGroupNumber,
         partMessage: ToxGroupPartMessage,

lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreImpl.kt

@@ -2,7 +2,6 @@
 
 import im.tox.tox4j.core.exceptions.ToxBootstrapException;
 import im.tox.tox4j.core.exceptions.ToxConferenceByIdException;
-import im.tox.tox4j.core.exceptions.ToxConferenceByUidException;
 import im.tox.tox4j.core.exceptions.ToxConferenceDeleteException;
 import im.tox.tox4j.core.exceptions.ToxConferenceGetTypeException;
 import im.tox.tox4j.core.exceptions.ToxConferenceInviteException;
@@ -33,7 +32,6 @@
 import im.tox.tox4j.core.exceptions.ToxGroupLeaveException;
 import im.tox.tox4j.core.exceptions.ToxGroupNewException;
 import im.tox.tox4j.core.exceptions.ToxGroupPeerQueryException;
-import im.tox.tox4j.core.exceptions.ToxGroupReconnectException;
 import im.tox.tox4j.core.exceptions.ToxGroupSelfNameSetException;
 import im.tox.tox4j.core.exceptions.ToxGroupSelfQueryException;
 import im.tox.tox4j.core.exceptions.ToxGroupSelfStatusSetException;
@@ -274,12 +272,6 @@ static native int toxConferenceGetType(int instanceNumber, int conferenceNumber)
     // Tox_Conference_Number tox_conference_by_id(
     //     const Tox *tox, const uint8_t id[TOX_CONFERENCE_ID_SIZE], Tox_Err_Conference_By_Id *error);
     static native int toxConferenceById(int instanceNumber, byte[] id) throws ToxConferenceByIdException;
-    // bool tox_conference_get_uid(
-    //     const Tox *tox, Tox_Conference_Number conference_number, uint8_t uid[TOX_CONFERENCE_UID_SIZE]);
-    static native byte[] toxConferenceGetUid(int instanceNumber, int conferenceNumber);
-    // Tox_Conference_Number tox_conference_by_uid(
-    //     const Tox *tox, const uint8_t uid[TOX_CONFERENCE_UID_SIZE], Tox_Err_Conference_By_Uid *error);
-    static native int toxConferenceByUid(int instanceNumber, byte[] uid) throws ToxConferenceByUidException;
 
     // Tox_Group_Number tox_group_new(
     //     Tox *tox, Tox_Group_Privacy_State privacy_state,
@@ -300,9 +292,6 @@ static native boolean toxGroupIsConnected(int instanceNumber, int groupNumber)
     // bool tox_group_disconnect(const Tox *tox, Tox_Group_Number group_number, Tox_Err_Group_Disconnect *error);
     static native void toxGroupDisconnect(int instanceNumber, int groupNumber)
         throws ToxGroupDisconnectException;
-    // bool tox_group_reconnect(Tox *tox, Tox_Group_Number group_number, Tox_Err_Group_Reconnect *error);
-    static native void toxGroupReconnect(int instanceNumber, int groupNumber)
-        throws ToxGroupReconnectException;
     // bool tox_group_leave(
     //     Tox *tox, Tox_Group_Number group_number,
     //     const uint8_t part_message[], size_t length,

lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java

@@ -9,7 +9,6 @@ import im.tox.tox4j.core.data.ToxConferenceOfflinePeerNumber
 import im.tox.tox4j.core.data.ToxConferencePeerName
 import im.tox.tox4j.core.data.ToxConferencePeerNumber
 import im.tox.tox4j.core.data.ToxConferenceTitle
-import im.tox.tox4j.core.data.ToxConferenceUid
 import im.tox.tox4j.core.data.ToxFileId
 import im.tox.tox4j.core.data.ToxFilename
 import im.tox.tox4j.core.data.ToxFriendAddress
@@ -834,16 +833,6 @@ interface ToxCore : AutoCloseable {
      */
     fun conferenceById(conferenceId: ToxConferenceId): ToxConferenceNumber
 
-    /**
-     * Get the conference unique ID.
-     */
-    fun conferenceGetUid(conferenceNumber: ToxConferenceNumber): ToxConferenceUid
-
-    /**
-     * Return the conference number associated with the specified uid.
-     */
-    fun conferenceByUid(conferenceUid: ToxConferenceUid): ToxConferenceNumber
-
     /**
      * Creates a new group chat.
      *
@@ -899,17 +888,6 @@ interface ToxCore : AutoCloseable {
      */
     fun groupDisconnect(groupNumber: ToxGroupNumber): Unit
 
-    /**
-     * Reconnects to a group.
-     *
-     * This function disconnects from all peers in the group, then attempts to
-     * reconnect with the group. The caller's state is not changed (i.e. name,
-     * status, role, chat public key etc.).
-     *
-     * @param groupNumber The group number of the group we wish to reconnect to.
-     */
-    fun groupReconnect(groupNumber: ToxGroupNumber): Unit
-
     /**
      * Leaves a group.
      *