Version 1.8.4

Author: slowscript

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId 'slowscript.warpinator'
         minSdkVersion 21 //Required by NSD (attributes)
         targetSdkVersion 35
-        versionCode 1083
-        versionName "1.8.3"
+        versionCode 1084
+        versionName "1.8.4"
     }
 
     buildTypes {
@@ -64,7 +64,7 @@ dependencies {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.21.5'
+        artifact = 'com.google.protobuf:protoc:3.25.8'
     }
     plugins {
         grpc {

app/src/main/java/slowscript/warpinator/GrpcService.java

@@ -6,9 +6,6 @@
 import com.google.common.net.InetAddresses;
 import com.google.protobuf.ByteString;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 import io.grpc.Status;
 import io.grpc.StatusException;
 import io.grpc.stub.ServerCallStreamObserver;
@@ -20,10 +17,9 @@ public class GrpcService extends WarpGrpc.WarpImplBase {
     @Override
     public void checkDuplexConnection(WarpProto.LookupName request, StreamObserver<WarpProto.HaveDuplex> responseObserver) {
         String id = request.getId();
-
+        Remote r = MainService.remotes.get(id);
         boolean haveDuplex = false;
-        if(MainService.remotes.containsKey(id)) {
-            Remote r = MainService.remotes.get(id);
+        if (r != null) {
             haveDuplex = (r.status == Remote.RemoteStatus.CONNECTED)
                         || (r.status == Remote.RemoteStatus.AWAITING_DUPLEX);
             //The other side is trying to connect with use after a connection failed

app/src/main/java/slowscript/warpinator/Remote.java

@@ -338,7 +338,7 @@ private boolean receiveCertificateV1() {
             try {
                 Log.v(TAG, "Receiving certificate from " + address.toString() + ", try " + tryCount);
                 DatagramSocket sock = new DatagramSocket();
-                sock.setSoTimeout(1000);
+                sock.setSoTimeout(1500);
 
                 byte[] req = CertServer.REQUEST.getBytes();
                 DatagramPacket p = new DatagramPacket(req, req.length, address, port);
@@ -356,9 +356,6 @@ private boolean receiveCertificateV1() {
             } catch (Exception e) {
                 tryCount++;
                 Log.d(TAG, "receiveCertificate: attempt " + tryCount + " failed: " + e.getMessage());
-                try {
-                    Thread.sleep(1000);
-                } catch (Exception ignored) { }
             }
         }
         if (tryCount == 3) {
@@ -396,7 +393,7 @@ private boolean receiveCertificateV2() {
             errorReceiveCert = false;
             return true;
         } catch (Exception e) {
-            Log.w(TAG, "Could not receive certificate", e);
+            Log.w(TAG, "Could not receive certificate from " + hostname, e);
             errorReceiveCert = true;
         }
         return false;

app/src/main/java/slowscript/warpinator/Server.java

@@ -259,6 +259,7 @@ void registerService(boolean flush) {
         // Unregister possibly leftover service info
         // -> Announcement will trigger "new service" behavior and reconnect on other clients
         unregister(); //Safe if fails
+        Utils.sleep(250);
         try {
             Log.d(TAG, "Registering as " + uuid);
             jmdns.registerService(serviceInfo);

fastlane/metadata/android/en-US/changelogs/1084.txt

@@ -0,0 +1,7 @@
+- Target Android 15 (no autostart on A15+)
+- Edge to edge UI (as required by A15)
+- Warn about device not being on the same subnet
+- Show IP in network interface picker
+- Use fixed color app icon
+- Fixed showing manual connect dialog
+- More fixes, could solve some connection issues