From 034b7f3844cd28565d34e057e1cd625f1a7c2720 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Mon, 7 Aug 2017 19:53:08 +0200
Subject: [PATCH] More feature-not-implemented and remove crap

---
 .../jingle/component/JingleSession.java       | 106 +-----------------
 .../jingle_s5b/JingleS5BTransportManager.java |   2 +-
 2 files changed, 5 insertions(+), 103 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java
index b57c49e59..2f411c532 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java
@@ -27,6 +27,7 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.util.Async;
 import org.jivesoftware.smackx.jingle.JingleDescriptionManager;
 import org.jivesoftware.smackx.jingle.JingleManager;
@@ -289,6 +290,8 @@ public class JingleSession {
     }
 
     private IQ handleContentRemove(final JingleElement request) {
+        return IQ.createErrorResponse(request, XMPPError.Condition.feature_not_implemented);
+        /*
         for (JingleContentElement r : request.getContents()) {
             final JingleContent removed = contents.get(r.getName());
 
@@ -307,110 +310,9 @@ public class JingleSession {
         }
 
         return IQ.createResultIQ(request);
+        */
     }
 
-    /* ############## Processed further down ############## */
-
-    private IQ handleContentModify(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleContentModify(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    private IQ handleDescriptionInfo(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleDescriptionInfo(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    private IQ handleSecurityInfo(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleSecurityInfo(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    private IQ handleSessionInfo(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleSessionInfo(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    private IQ handleTransportAccept(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleTransportAccept(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    private IQ handleTransportInfo(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleTransportInfo(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    private IQ handleTransportReject(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleTransportReject(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    private IQ handleTransportReplace(final JingleElement request) {
-        final JingleContent content = getSoleAffectedContentOrThrow(request);
-        Async.go(new Runnable() {
-            @Override
-            public void run() {
-                content.handleTransportReplace(request, jingleManager.getConnection());
-            }
-        });
-
-        return IQ.createResultIQ(request);
-    }
-
-    /* ################ Other getters and setters ############### */
-
     public FullJid getInitiator() {
         return initiator;
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java
index 4973ec17e..d2bca38c9 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java
@@ -65,7 +65,7 @@ public final class JingleS5BTransportManager extends Manager implements JingleTr
     private List<Bytestream.StreamHost> localStreamHosts = null;
     private List<Bytestream.StreamHost> availableStreamHosts = null;
 
-    public static boolean useLocalCandidates = true;
+    public static boolean useLocalCandidates = false;
     public static boolean useExternalCandidates = true;
 
     static {