From b59c48c52fbe9b063729dc6d22102f25842181ab Mon Sep 17 00:00:00 2001 From: xylophone21 Date: Thu, 17 Feb 2022 15:54:57 +0800 Subject: [PATCH 1/4] fix removeServices exception, we missed clear registrationListeners --- .../platform/NsdManagerServiceResolver.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java index dbbb9052c710f0..080fa90e3ce284 100644 --- a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java +++ b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java @@ -168,23 +168,31 @@ public void onUnregistrationFailed(NsdServiceInfo serviceInfo, int errorCode) { @Override public void onServiceRegistered(NsdServiceInfo serviceInfo) { - Log.i(TAG, "service " + serviceInfo.getServiceName() + " onServiceRegistered"); + Log.i(TAG, "service " + serviceInfo.getServiceName() + "(" + this + ") onServiceRegistered"); } @Override public void onServiceUnregistered(NsdServiceInfo serviceInfo) { - Log.i(TAG, "service " + serviceInfo.getServiceName() + " onServiceRegistered"); + Log.i(TAG, "service " + serviceInfo.getServiceName() + "(" + this + ") onServiceUnregistered"); } }; registrationListeners.add(registrationListener); nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, registrationListener); + Log.d(TAG, "publish " + registrationListener + " count = " + registrationListeners.stream().count()); } @Override public void removeServices() { - for (NsdManager.RegistrationListener l : registrationListeners) { - nsdManager.unregisterService(l); - } + Log.d(TAG, "removeServices: "); + for (NsdManager.RegistrationListener l : registrationListeners) { + Log.i(TAG, "Remove " + l); + try { + nsdManager.unregisterService(l); + } catch (Exception exception) { + Log.e(TAG, "removeServices: error = " + exception.getMessage()); + } + } + registrationListeners.clear(); } } From 700dd5ad3af7a0838ded6a71283a6a11d09e8891 Mon Sep 17 00:00:00 2001 From: xylophone21 Date: Thu, 17 Feb 2022 16:03:26 +0800 Subject: [PATCH 2/4] fix restyled-io and ci errors --- .../platform/NsdManagerServiceResolver.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java index 080fa90e3ce284..cf0348a5e41661 100644 --- a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java +++ b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java @@ -168,31 +168,37 @@ public void onUnregistrationFailed(NsdServiceInfo serviceInfo, int errorCode) { @Override public void onServiceRegistered(NsdServiceInfo serviceInfo) { - Log.i(TAG, "service " + serviceInfo.getServiceName() + "(" + this + ") onServiceRegistered"); + Log.i( + TAG, + "service " + serviceInfo.getServiceName() + "(" + this + ") onServiceRegistered"); } @Override public void onServiceUnregistered(NsdServiceInfo serviceInfo) { - Log.i(TAG, "service " + serviceInfo.getServiceName() + "(" + this + ") onServiceUnregistered"); + Log.i( + TAG, + "service " + serviceInfo.getServiceName() + "(" + this + ") onServiceUnregistered"); } }; registrationListeners.add(registrationListener); nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, registrationListener); - Log.d(TAG, "publish " + registrationListener + " count = " + registrationListeners.stream().count()); + Log.d( + TAG, + "publish " + registrationListener + " count = " + registrationListeners.stream().count()); } @Override public void removeServices() { - Log.d(TAG, "removeServices: "); - for (NsdManager.RegistrationListener l : registrationListeners) { - Log.i(TAG, "Remove " + l); - try { - nsdManager.unregisterService(l); - } catch (Exception exception) { - Log.e(TAG, "removeServices: error = " + exception.getMessage()); - } + Log.d(TAG, "removeServices: "); + for (NsdManager.RegistrationListener l : registrationListeners) { + Log.i(TAG, "Remove " + l); + try { + nsdManager.unregisterService(l); + } catch (Exception exception) { + Log.e(TAG, "removeServices: error = " + exception.getMessage()); } - registrationListeners.clear(); + } + registrationListeners.clear(); } } From 90818c40ead494934309f72ebc70d2c6f8d51d93 Mon Sep 17 00:00:00 2001 From: xylophone21 Date: Fri, 18 Feb 2022 11:34:05 +0800 Subject: [PATCH 3/4] remove try catch --- .../java/chip/platform/NsdManagerServiceResolver.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java index cf0348a5e41661..f723eab6b90555 100644 --- a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java +++ b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java @@ -185,7 +185,7 @@ public void onServiceUnregistered(NsdServiceInfo serviceInfo) { nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, registrationListener); Log.d( TAG, - "publish " + registrationListener + " count = " + registrationListeners.stream().count()); + "publish " + registrationListener + " count = " + registrationListeners.size()); } @Override @@ -193,11 +193,7 @@ public void removeServices() { Log.d(TAG, "removeServices: "); for (NsdManager.RegistrationListener l : registrationListeners) { Log.i(TAG, "Remove " + l); - try { - nsdManager.unregisterService(l); - } catch (Exception exception) { - Log.e(TAG, "removeServices: error = " + exception.getMessage()); - } + nsdManager.unregisterService(l); } registrationListeners.clear(); } From 7aec0961910869e3a7a7f8853ef65cf25278ac33 Mon Sep 17 00:00:00 2001 From: xylophone21 Date: Fri, 18 Feb 2022 11:42:16 +0800 Subject: [PATCH 4/4] fix restyled-io and ci errors --- .../android/java/chip/platform/NsdManagerServiceResolver.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java index f723eab6b90555..63a28d3ffd5a8e 100644 --- a/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java +++ b/src/platform/android/java/chip/platform/NsdManagerServiceResolver.java @@ -183,9 +183,7 @@ public void onServiceUnregistered(NsdServiceInfo serviceInfo) { registrationListeners.add(registrationListener); nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, registrationListener); - Log.d( - TAG, - "publish " + registrationListener + " count = " + registrationListeners.size()); + Log.d(TAG, "publish " + registrationListener + " count = " + registrationListeners.size()); } @Override