fix: Make sure JNI can call the Code-only ctor in exceptions.

iphydf · iphydf · commit 134bbee7f285 · 2024-02-21T21:01:52.000Z
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavAnswerException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavAnswerException.kt
@@ -31,5 +31,6 @@ class ToxavAnswerException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.kt
@@ -25,5 +25,6 @@ class ToxavBitRateSetException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallControlException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallControlException.kt
@@ -27,5 +27,6 @@ class ToxavCallControlException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallException.kt
@@ -35,5 +35,6 @@ class ToxavCallException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavNewException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavNewException.kt
@@ -27,5 +27,6 @@ class ToxavNewException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavSendFrameException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavSendFrameException.kt
@@ -43,5 +43,6 @@ class ToxavSendFrameException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxBootstrapException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxBootstrapException.kt
@@ -27,5 +27,6 @@ class ToxBootstrapException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileControlException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileControlException.kt
@@ -41,5 +41,6 @@ class ToxFileControlException : ToxException {
         SENDQ,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileGetException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileGetException.kt
@@ -20,5 +20,6 @@ class ToxFileGetException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSeekException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSeekException.kt
@@ -35,5 +35,6 @@ class ToxFileSeekException : ToxException {
         SENDQ,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.kt
@@ -48,5 +48,6 @@ class ToxFileSendChunkException : ToxException {
         WRONG_POSITION,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendException.kt
@@ -31,5 +31,6 @@ class ToxFileSendException : ToxException {
         TOO_MANY,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendAddException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendAddException.kt
@@ -48,5 +48,6 @@ class ToxFriendAddException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.kt
@@ -15,5 +15,6 @@ class ToxFriendByPublicKeyException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.kt
@@ -41,5 +41,6 @@ class ToxFriendCustomPacketException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.kt
@@ -10,5 +10,6 @@ class ToxFriendDeleteException : ToxException {
         FRIEND_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.kt
@@ -10,5 +10,6 @@ class ToxFriendGetPublicKeyException : ToxException {
         FRIEND_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.kt
@@ -35,5 +35,6 @@ class ToxFriendSendMessageException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxGetPortException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxGetPortException.kt
@@ -10,5 +10,6 @@ class ToxGetPortException : ToxException {
         NOT_BOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxNewException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxNewException.kt
@@ -59,5 +59,6 @@ class ToxNewException : ToxException {
         PROXY_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetInfoException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetInfoException.kt
@@ -15,5 +15,6 @@ class ToxSetInfoException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetTypingException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetTypingException.kt
@@ -10,5 +10,6 @@ class ToxSetTypingException : ToxException {
         FRIEND_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.kt
@@ -35,5 +35,6 @@ class ToxDecryptionException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.kt
@@ -22,5 +22,6 @@ class ToxEncryptionException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.kt
@@ -16,5 +16,6 @@ class ToxGetSaltException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.kt
@@ -23,5 +23,6 @@ class ToxKeyDerivationException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/mkexceptions b/lib/src/commonMain/kotlin/im/tox/tox4j/mkexceptions
@@ -44,7 +44,8 @@ class Tox${prefix}${type}Exception : ToxException {
 $codes,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
 KOTLIN
 
diff --git a/lib/src/jvmTest/java/im/tox/tox4j/core/ToxCoreTest.kt b/lib/src/jvmTest/java/im/tox/tox4j/core/ToxCoreTest.kt
@@ -3,6 +3,7 @@ package im.tox.tox4j.core
 import im.tox.tox4j.core.callbacks.ToxCoreEventListener
 import im.tox.tox4j.core.data.ToxFriendNumber
 import im.tox.tox4j.core.enums.ToxConnection
+import im.tox.tox4j.core.exceptions.ToxBootstrapException
 import im.tox.tox4j.core.options.ToxOptions
 import im.tox.tox4j.impl.jni.ToxCoreImpl
 import kotlinx.coroutines.CoroutineScope
@@ -11,6 +12,7 @@ import kotlinx.coroutines.runBlocking
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.coroutineContext
 import kotlin.test.Test
+import kotlin.test.assertFailsWith
 
 @kotlin.ExperimentalStdlibApi
 class ToxCoreTest {
@@ -53,6 +55,15 @@ class ToxCoreTest {
             }
         }
 
+    @Test
+    fun bootstrap_withWrongHost_shouldFail() =
+        runTox {
+            val tox = newToxCore(ToxOptions())
+            assertFailsWith<ToxBootstrapException> {
+                tox.bootstrap("host-does-not-exist", tox.getUdpPort, tox.getDhtId)
+            }
+        }
+
     @Test
     fun addFriendNorequest_shouldConnectTwoToxes() =
         runTox {

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,6 @@ class ToxavAnswerException : ToxException {`
`31`	`31`	`SYNC,`
`32`	`32`	`}`
`33`	`33`
`34`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`34`	`+ constructor(code: Code) : this(code, "")`
	`35`	`+ constructor(code: Code, message: String) : super(code, message)`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,6 @@ class ToxavBitRateSetException : ToxException {`
`25`	`25`	`SYNC,`
`26`	`26`	`}`
`27`	`27`
`28`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`28`	`+ constructor(code: Code) : this(code, "")`
	`29`	`+ constructor(code: Code, message: String) : super(code, message)`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,6 @@ class ToxavCallControlException : ToxException {`
`27`	`27`	`SYNC,`
`28`	`28`	`}`
`29`	`29`
`30`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`30`	`+ constructor(code: Code) : this(code, "")`
	`31`	`+ constructor(code: Code, message: String) : super(code, message)`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,6 @@ class ToxavCallException : ToxException {`
`35`	`35`	`SYNC,`
`36`	`36`	`}`
`37`	`37`
`38`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`38`	`+ constructor(code: Code) : this(code, "")`
	`39`	`+ constructor(code: Code, message: String) : super(code, message)`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,6 @@ class ToxavNewException : ToxException {`
`27`	`27`	`NULL,`
`28`	`28`	`}`
`29`	`29`
`30`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`30`	`+ constructor(code: Code) : this(code, "")`
	`31`	`+ constructor(code: Code, message: String) : super(code, message)`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,6 @@ class ToxavSendFrameException : ToxException {`
`43`	`43`	`SYNC,`
`44`	`44`	`}`
`45`	`45`
`46`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`46`	`+ constructor(code: Code) : this(code, "")`
	`47`	`+ constructor(code: Code, message: String) : super(code, message)`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,6 @@ class ToxBootstrapException : ToxException {`
`27`	`27`	`NULL,`
`28`	`28`	`}`
`29`	`29`
`30`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`30`	`+ constructor(code: Code) : this(code, "")`
	`31`	`+ constructor(code: Code, message: String) : super(code, message)`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,6 @@ class ToxFileControlException : ToxException {`
`41`	`41`	`SENDQ,`
`42`	`42`	`}`
`43`	`43`
`44`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`44`	`+ constructor(code: Code) : this(code, "")`
	`45`	`+ constructor(code: Code, message: String) : super(code, message)`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ class ToxFileGetException : ToxException {`
`20`	`20`	`NULL,`
`21`	`21`	`}`
`22`	`22`
`23`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`23`	`+ constructor(code: Code) : this(code, "")`
	`24`	`+ constructor(code: Code, message: String) : super(code, message)`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,6 @@ class ToxFileSeekException : ToxException {`
`35`	`35`	`SENDQ,`
`36`	`36`	`}`
`37`	`37`
`38`		`- constructor(code: Code, message: String = "") : super(code, message)`
	`38`	`+ constructor(code: Code) : this(code, "")`
	`39`	`+ constructor(code: Code, message: String) : super(code, message)`
`39`	`40`	`}`