Don't autoreconnect when signed in in another location

Author: tgalal

yowsup/layers/interface/interface.py

@@ -1,10 +1,10 @@
 from yowsup.layers import YowLayer, YowLayerEvent
 from yowsup.layers.protocol_iq.protocolentities import IqProtocolEntity
-from yowsup.layers.network import YowNetworkLayer
 from yowsup.layers.auth import YowAuthenticationProtocolLayer
 from yowsup.layers.protocol_media.protocolentities.iq_requestupload import RequestUploadIqProtocolEntity
 from yowsup.layers.protocol_media.mediauploader import MediaUploader
 from yowsup.layers.network.layer import YowNetworkLayer
+from yowsup.layers.auth.protocolentities import StreamErrorProtocolEntity
 from yowsup.layers import EventCallback
 import inspect
 import logging
@@ -85,12 +85,15 @@ def receive(self, entity):
     def onStreamError(self, streamErrorEntity):
         logger.error(streamErrorEntity)
         if self.getProp(self.__class__.PROP_RECONNECT_ON_STREAM_ERR, True):
-            logger.info("Initiating reconnect")
-            self.reconnect = True
-            self.disconnect()
+            if streamErrorEntity.getErrorType() == StreamErrorProtocolEntity.TYPE_CONFLICT:
+                logger.warn("Not reconnecting because you signed in in another location")
+            else:
+                logger.info("Initiating reconnect")
+                self.reconnect = True
         else:
-            logger.warn("No reconnecting because property %s is not set" % self.__class__.PROP_RECONNECT_ON_STREAM_ERR)
+            logger.warn("Not reconnecting because property %s is not set" % self.__class__.PROP_RECONNECT_ON_STREAM_ERR)
         self.toUpper(streamErrorEntity)
+        self.disconnect()
 
     @EventCallback(YowNetworkLayer.EVENT_STATE_CONNECTED)
     def onConnected(self, yowLayerEvent):