#13 Bugfix: Fix RuntimeException error when server has been killed.

codezjx · Apr 18, 2022 · d77f891 · d77f891
1 parent 3729cd5
commit d77f891
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/andlinker/src/main/java/com/codezjx/andlinker/AndLinker.java b/andlinker/src/main/java/com/codezjx/andlinker/AndLinker.java
@@ -104,7 +104,7 @@ public void unbind() {
             return;
         }
         mContext.unbindService(mServiceConnection);
-        handleUnBind();
+        handleUnBind(true);
     }
 
     /**
@@ -166,21 +166,24 @@ public void onServiceConnected(ComponentName name, IBinder service) {
             @Override
             public void onServiceDisconnected(ComponentName name) {
                 Logger.d(TAG, "onServiceDisconnected:" + name);
-                handleUnBind();
+                handleUnBind(false);
             }
         };
     }
 
-    private void handleUnBind() {
+    private void handleUnBind(boolean unRegister) {
+        Logger.d(TAG, "handleUnBind:" + unRegister);
         if (mTransferService == null) {
             Logger.e(TAG, "Error occur, TransferService was null when service disconnected.");
             fireOnUnBind();
             return;
         }
-        try {
-            mTransferService.unRegister(mCallback);
-        } catch (RemoteException e) {
-            e.printStackTrace();
+        if (unRegister) {
+            try {
+                mTransferService.unRegister(mCallback);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
         }
         mTransferService = null;
         fireOnUnBind();