diff --git a/core/src/cz/nic/tablexia/menu/user/UserMenu.java b/core/src/cz/nic/tablexia/menu/user/UserMenu.java index 0d25caba512100f9fc8e5558dc91aa2dea681014..e11b95ccb5ae1dda1044c7246b4bd7fe30ff4750 100644 --- a/core/src/cz/nic/tablexia/menu/user/UserMenu.java +++ b/core/src/cz/nic/tablexia/menu/user/UserMenu.java @@ -76,7 +76,6 @@ public class UserMenu extends AbstractMenu { private static final float SYNC_FAILED_DIALOG_BOTTOM_PADDING = 1/40f; public static final String CODE_REGEX = "((([0-9]|[a-f]){8})-(([0-9]|[a-f]){4})-(([0-9]|[a-f]){4})-(([0-9]|[a-f]){4})-(([0-9]|[a-f]){12}))"; - public static final String QR_CODE_UUID_REGEX = "UUID\\s*:\\s*" + CODE_REGEX; private List<User> users; @@ -227,7 +226,7 @@ public class UserMenu extends AbstractMenu { Tablexia.getQRCodeScanner().stopCameraPreview(); Tablexia.getQRCodeScanner().removeQRCodeListener(this); - Pattern pattern = Pattern.compile(QR_CODE_UUID_REGEX); + Pattern pattern = Pattern.compile(CODE_REGEX); Matcher matcher = pattern.matcher(data); if(matcher.find()) { diff --git a/core/src/cz/nic/tablexia/util/ui/QRCodeScanner.java b/core/src/cz/nic/tablexia/util/ui/QRCodeScanner.java index ddb71895fd016910f14d092af98031d90decdd89..f33a56c97a590f092c67e1adf86b0ece557b5e27 100644 --- a/core/src/cz/nic/tablexia/util/ui/QRCodeScanner.java +++ b/core/src/cz/nic/tablexia/util/ui/QRCodeScanner.java @@ -38,7 +38,7 @@ public abstract class QRCodeScanner { } } - public void onCodeScanned(String data) { + public synchronized void onCodeScanned(String data) { if(listeners != null) { for(QRCodeListener listener : listeners) { listener.onCodeScanned(data); diff --git a/ios/src/cz/nic/tablexia/IOSLauncher.java b/ios/src/cz/nic/tablexia/IOSLauncher.java index 233197e9ad26f401f84ebe402722e75949a60a31..fe6c4bee7e0aff45ce13b3ff612c1f875aad0658 100644 --- a/ios/src/cz/nic/tablexia/IOSLauncher.java +++ b/ios/src/cz/nic/tablexia/IOSLauncher.java @@ -5,8 +5,6 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.backends.iosrobovm.IOSApplication; import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration; -import org.robovm.apple.coreservices.CFHost; -import org.robovm.apple.coreservices.CFHostInfoType; import org.robovm.apple.foundation.NSException; import org.robovm.objc.block.VoidBlock1; import org.robovm.apple.foundation.NSAutoreleasePool; @@ -19,7 +17,6 @@ import org.robovm.apple.systemconfiguration.SCNetworkReachabilityFlags; import org.robovm.apple.uikit.UIApplication; import org.robovm.apple.uikit.UIApplicationLaunchOptions; -import java.net.InetSocketAddress; import java.util.Locale; import cz.nic.tablexia.screen.loader.IConnectionManager;