diff --git a/README-CHANGES.xml b/README-CHANGES.xml
index 46708b0..42e0105 100644
--- a/README-CHANGES.xml
+++ b/README-CHANGES.xml
@@ -61,8 +61,10 @@
-
-
+
+
+
+
diff --git a/gradle.properties b/gradle.properties
index b532f7c..0e7615c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ POM_SCM_CONNECTION=scm:git:git://github.com/ThePalaceProject/android-r2
POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/ThePalaceProject/android-r2
POM_SCM_URL=http://github.com/ThePalaceProject/android-r2
POM_URL=http://github.com/ThePalaceProject/android-r2
-VERSION_NAME=2.5.1-SNAPSHOT
+VERSION_NAME=2.6.0-SNAPSHOT
VERSION_PREVIOUS=2.5.0
android.useAndroidX=true
diff --git a/org.librarysimplified.r2.demo/build.gradle.kts b/org.librarysimplified.r2.demo/build.gradle.kts
index 3816114..974a9f7 100644
--- a/org.librarysimplified.r2.demo/build.gradle.kts
+++ b/org.librarysimplified.r2.demo/build.gradle.kts
@@ -67,8 +67,6 @@ dependencies {
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.coroutines.core.jvm)
implementation(libs.logback.android)
- implementation(libs.nano.httpd)
- implementation(libs.nano.httpd.nanolets)
implementation(libs.palace.theme)
implementation(libs.r2.shared)
implementation(libs.r2.streamer)
diff --git a/org.librarysimplified.r2.vanilla/build.gradle.kts b/org.librarysimplified.r2.vanilla/build.gradle.kts
index 1e396bc..01239fa 100644
--- a/org.librarysimplified.r2.vanilla/build.gradle.kts
+++ b/org.librarysimplified.r2.vanilla/build.gradle.kts
@@ -10,8 +10,6 @@ dependencies {
implementation(libs.kotlin.stdlib)
implementation(libs.kotlinx.coroutines)
implementation(libs.kotlinx.coroutines.android)
- implementation(libs.nano.httpd)
- implementation(libs.nano.httpd.nanolets)
implementation(libs.r2.shared)
implementation(libs.r2.streamer)
implementation(libs.rxjava2)
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt
index 57bebab..bd46e0f 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt
@@ -408,7 +408,7 @@ internal class SR2Controller private constructor(
command: SR2CommandSubmission,
apiCommand: SR2Command.ThemeSet,
): ListenableFuture<*> {
- this.publishCommmandRunningLong(command)
+ this.publishCommandRunningLong(command)
return this.executeThemeSet(this.waitForWebViewAvailability(), apiCommand.theme)
}
@@ -741,7 +741,7 @@ internal class SR2Controller private constructor(
val previousNode = this.currentTarget
return try {
- this.publishCommmandRunningLong(command)
+ this.publishCommandRunningLong(command)
val target =
this.navigationGraph.findNavigationNode(locator)
@@ -1005,27 +1005,27 @@ internal class SR2Controller private constructor(
try {
this.queueExecutor.execute {
- this.publishCommmandStart(command)
+ this.publishCommandStart(command)
val future = this.executeInternalCommand(command)
try {
try {
future.get()
- this.publishCommmandSucceeded(command)
+ this.publishCommandSucceeded(command)
} catch (e: ExecutionException) {
throw e.cause!!
}
} catch (e: SR2WebViewDisconnectedException) {
this.logger.debug("webview disconnected: could not execute {}", command)
this.publishEvent(SR2Event.SR2Error.SR2WebViewInaccessible("No web view is connected"))
- this.publishCommmandFailed(command, e)
+ this.publishCommandFailed(command, e)
} catch (e: Exception) {
this.logger.error("{}: ", command, e)
- this.publishCommmandFailed(command, e)
+ this.publishCommandFailed(command, e)
}
}
} catch (e: Exception) {
this.logger.error("{}: ", command, e)
- this.publishCommmandFailed(command, e)
+ this.publishCommandFailed(command, e)
}
}
@@ -1033,7 +1033,7 @@ internal class SR2Controller private constructor(
* Publish an event to indicate that the current command is taking a long time to execute.
*/
- private fun publishCommmandRunningLong(command: SR2CommandSubmission) {
+ private fun publishCommandRunningLong(command: SR2CommandSubmission) {
this.publishEvent(SR2CommandExecutionRunningLong(command.command))
}
@@ -1045,18 +1045,18 @@ internal class SR2Controller private constructor(
}
}
- private fun publishCommmandSucceeded(command: SR2CommandSubmission) {
+ private fun publishCommandSucceeded(command: SR2CommandSubmission) {
this.publishEvent(SR2CommandExecutionSucceeded(command.command))
}
- private fun publishCommmandFailed(
+ private fun publishCommandFailed(
command: SR2CommandSubmission,
exception: Exception,
) {
this.publishEvent(SR2CommandExecutionFailed(command.command, exception))
}
- private fun publishCommmandStart(command: SR2CommandSubmission) {
+ private fun publishCommandStart(command: SR2CommandSubmission) {
this.publishEvent(SR2CommandExecutionStarted(command.command))
}
diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
index 14516d8..ce68d10 160000
--- a/org.thepalaceproject.android.platform
+++ b/org.thepalaceproject.android.platform
@@ -1 +1 @@
-Subproject commit 14516d8622777902f04be3016a1bc519c55fbe6f
+Subproject commit ce68d100180a4fbcee5b76e2e2dc7eea43ccb856