Remove unused OSGi stuff and deprecated Smack/Kotlin usages

jitsi · Nov 14, 2021 · de29320 · de29320
1 parent 12ecb1f
commit de29320
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 293 deletions.
diff --git a/jicoco-config/src/main/kotlin/org/jitsi/config/TypesafeConfigSource.kt b/jicoco-config/src/main/kotlin/org/jitsi/config/TypesafeConfigSource.kt
@@ -45,7 +45,7 @@ class TypesafeConfigSource(
         return when (type) {
             typeOf<Boolean>() -> wrap { key ->
                 // Typesafe is case-sensitive and does not accept "True" or "False" as valid boolean values.
-                when (config.getString(key).toLowerCase()) {
+                when (config.getString(key).lowercase()) {
                     "true" -> true
                     "false" -> false
                     else -> config.getBoolean(key)

diff --git a/jicoco/src/main/java/org/jitsi/meet/OSGiBundleConfig.java b/jicoco/src/main/java/org/jitsi/meet/OSGiBundleConfig.java
diff --git a/jicoco/src/main/java/org/jitsi/meet/OSGiClassLoader.java b/jicoco/src/main/java/org/jitsi/meet/OSGiClassLoader.java
diff --git a/jicoco/src/main/java/org/jitsi/xmpp/mucclient/MucClient.java b/jicoco/src/main/java/org/jitsi/xmpp/mucclient/MucClient.java
@@ -762,7 +762,7 @@ void setPresenceExtensions(Collection<ExtensionElement> extensions)
                 return;
             }
 
-            lastPresenceSent = lastPresenceSent.cloneWithNewId();
+            lastPresenceSent = lastPresenceSent.asBuilder((String) null).build();
 
             // The initial presence sent by smack contains an empty "x"
             // extension. If this extension is included in a subsequent stanza,

diff --git a/jicoco/src/main/java/org/jitsi/xmpp/util/IQUtils.java b/jicoco/src/main/java/org/jitsi/xmpp/util/IQUtils.java
@@ -18,7 +18,6 @@
 import org.jetbrains.annotations.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.provider.*;
-import org.jivesoftware.smack.util.*;
 import org.jivesoftware.smack.xml.*;
 import org.jxmpp.jid.impl.*;
 
@@ -82,7 +81,7 @@ public static IQ createError(IQ request, StanzaError.Condition errorCondition, S
      */
     public static <T extends org.jivesoftware.smack.packet.IQ> T parse(
             @NotNull String iqStr,
-            @NotNull IQProvider<T> iqProvider)
+            @NotNull IqProvider<T> iqProvider)
         throws Exception
     {
         T smackIQ;
@@ -105,7 +104,7 @@ public static <T extends org.jivesoftware.smack.packet.IQ> T parse(
                 eventType = parser.next();
                 if (XmlPullParser.Event.START_ELEMENT == eventType)
                 {
-                    smackIQ = iqProvider.parse(parser);
+                    smackIQ = iqProvider.parse(parser, null);
 
                     if (smackIQ != null)
                     {