Merge branch '123-sync-closed-checks' into dev

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/sync/SyncClient.java

@@ -132,7 +132,7 @@ public interface SyncClient extends Closeable {
     void start();
 
     /**
-     * Stops the client. Does nothing if the sync client is already stopped or closed.
+     * Stops the client. Does nothing if the sync client is already stopped.
      */
     void stop();
 

objectbox-java/src/main/java/io/objectbox/sync/SyncClientImpl.java

@@ -48,10 +48,11 @@ public class SyncClientImpl implements SyncClient {
         this.connectivityMonitor = builder.platform.getConnectivityMonitor();
 
         long boxStoreHandle = InternalAccess.getHandle(builder.boxStore);
-        this.handle = nativeCreate(boxStoreHandle, serverUrl, builder.trustedCertPaths);
+        long handle = nativeCreate(boxStoreHandle, serverUrl, builder.trustedCertPaths);
         if (handle == 0) {
             throw new RuntimeException("Failed to create sync client: handle is zero.");
         }
+        this.handle = handle;
 
         // Only change setting if not default (automatic sync updates and push subscription enabled).
         if (builder.requestUpdatesMode != RequestUpdatesMode.AUTO) {
@@ -84,6 +85,14 @@ public class SyncClientImpl implements SyncClient {
         InternalAccess.setSyncClient(builder.boxStore, this);
     }
 
+    private long getHandle() {
+        long handle = this.handle;
+        if (handle == 0) {
+            throw new IllegalStateException("SyncClient already closed");
+        }
+        return handle;
+    }
+
     @Override
     public String getServerUrl() {
         return serverUrl;
@@ -101,24 +110,24 @@ public boolean isLoggedIn() {
 
     @Override
     public long getServerTimeNanos() {
-        return nativeServerTime(handle);
+        return nativeServerTime(getHandle());
     }
 
     @Override
     public long getServerTimeDiffNanos() {
-        return nativeServerTimeDiff(handle);
+        return nativeServerTimeDiff(getHandle());
     }
 
     @Override
     public long getRoundtripTimeNanos() {
-        return nativeRoundtripTime(handle);
+        return nativeRoundtripTime(getHandle());
     }
 
     /**
      * Gets the current state of this sync client. Throws if {@link #close()} was called.
      */
     public SyncState getSyncState() {
-        return SyncState.fromId(nativeGetState(handle));
+        return SyncState.fromId(nativeGetState(getHandle()));
     }
 
     @Override
@@ -133,7 +142,7 @@ public void setSyncCompletedListener(@Nullable SyncCompletedListener listener) {
 
     @Override
     public void setSyncChangeListener(@Nullable SyncChangeListener changesListener) {
-        nativeSetSyncChangesListener(handle, changesListener);
+        nativeSetSyncChangesListener(getHandle(), changesListener);
     }
 
     @Override
@@ -158,7 +167,7 @@ public void setSyncListener(@Nullable SyncListener listener) {
     @Override
     public void setLoginCredentials(SyncCredentials credentials) {
         SyncCredentialsToken credentialsInternal = (SyncCredentialsToken) credentials;
-        nativeSetLoginInfo(handle, credentialsInternal.getTypeId(), credentialsInternal.getTokenBytes());
+        nativeSetLoginInfo(getHandle(), credentialsInternal.getTypeId(), credentialsInternal.getTokenBytes());
         credentialsInternal.clear(); // Clear immediately, not needed anymore.
     }
 
@@ -172,7 +181,7 @@ public boolean awaitFirstLogin(long millisToWait) {
 
     @Override
     public synchronized void start() {
-        nativeStart(handle);
+        nativeStart(getHandle());
         started = true;
         if (connectivityMonitor != null) {
             connectivityMonitor.setObserver(this);
@@ -189,11 +198,7 @@ public synchronized void stop() {
         if (connectivityMonitor != null) {
             connectivityMonitor.removeObserver();
         }
-
-        long handleToStop = this.handle;
-        if (handleToStop != 0) {
-            nativeStop(handleToStop);
-        }
+        nativeStop(getHandle());
         started = false;
     }
 
@@ -240,35 +245,35 @@ protected void finalize() throws Throwable {
     @Override
     @Experimental
     public boolean requestFullSync() {
-        return nativeRequestFullSync(handle, false);
+        return nativeRequestFullSync(getHandle(), false);
     }
 
     /**
      * Temporary only, try not to use it.
      */
     @Experimental
     public boolean requestFullSyncAndUpdates() {
-        return nativeRequestFullSync(handle, true);
+        return nativeRequestFullSync(getHandle(), true);
     }
 
     @Override
     public boolean requestUpdates() {
-        return nativeRequestUpdates(handle, true);
+        return nativeRequestUpdates(getHandle(), true);
     }
 
     @Override
     public boolean requestUpdatesOnce() {
-        return nativeRequestUpdates(handle, false);
+        return nativeRequestUpdates(getHandle(), false);
     }
 
     @Override
     public boolean cancelUpdates() {
-        return nativeCancelUpdates(handle);
+        return nativeCancelUpdates(getHandle());
     }
 
     @Override
     public void notifyConnectionAvailable() {
-        nativeTriggerReconnect(handle);
+        nativeTriggerReconnect(getHandle());
     }
 
     @Override
@@ -452,7 +457,7 @@ public boolean send() {
             }
             checkNotSent();
             sent = true;
-            return syncClient.nativeObjectsMessageSend(syncClient.handle, builderHandle);
+            return syncClient.nativeObjectsMessageSend(syncClient.getHandle(), builderHandle);
         }
 
         private void checkNotSent() {

objectbox-java/src/main/java/io/objectbox/sync/server/SyncServerImpl.java

@@ -25,10 +25,11 @@ public class SyncServerImpl implements SyncServer {
         this.url = builder.url;
 
         long storeHandle = InternalAccess.getHandle(builder.boxStore);
-        handle = nativeCreate(storeHandle, url, builder.certificatePath);
+        long handle = nativeCreate(storeHandle, url, builder.certificatePath);
         if (handle == 0) {
             throw new RuntimeException("Failed to create sync server: handle is zero.");
         }
+        this.handle = handle;
 
         for (SyncCredentials credentials : builder.credentials) {
             SyncCredentialsToken credentialsInternal = (SyncCredentialsToken) credentials;
@@ -46,40 +47,48 @@ public class SyncServerImpl implements SyncServer {
         }
     }
 
+    private long getHandle() {
+        long handle = this.handle;
+        if (handle == 0) {
+            throw new IllegalStateException("SyncServer already closed");
+        }
+        return handle;
+    }
+
     @Override
     public String getUrl() {
         return url;
     }
 
     @Override
     public int getPort() {
-        return nativeGetPort(handle);
+        return nativeGetPort(getHandle());
     }
 
     @Override
     public boolean isRunning() {
-        return nativeIsRunning(handle);
+        return nativeIsRunning(getHandle());
     }
 
     @Override
     public String getStatsString() {
-        return nativeGetStatsString(handle);
+        return nativeGetStatsString(getHandle());
     }
 
     @Override
     public void setSyncChangeListener(@Nullable SyncChangeListener changesListener) {
         this.syncChangeListener = changesListener;
-        nativeSetSyncChangesListener(handle, changesListener);
+        nativeSetSyncChangesListener(getHandle(), changesListener);
     }
 
     @Override
     public void start() {
-        nativeStart(handle);
+        nativeStart(getHandle());
     }
 
     @Override
     public void stop() {
-        nativeStop(handle);
+        nativeStop(getHandle());
     }
 
     @Override