Fix debug artifacts, NPE in reportDisconnected, and silent failure after max reconnects (#1332)

* Initial plan

* Fix debug artifacts, NPE in reportDisconnected, and silent failure after max reconnects

Co-authored-by: gerhardol <6248932+gerhardol@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: gerhardol <6248932+gerhardol@users.noreply.github.com>

Author: Copilot

hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java

@@ -137,8 +137,6 @@ private static String stateToString(int state) {
   public void open(Handler handler, HRClient hrClient) {
     this.hrClient = hrClient;
     this.hrClientHandler = handler;
-    System.err.println("KESO open: " + getName());
-
     if (btAdapter == null) {
       btAdapter = BluetoothAdapter.getDefaultAdapter();
     }
@@ -908,11 +906,11 @@ private void reportDisconnected(String msg) {
     }
 
     if (isDisconnecting) {
-      hrClient.onDisconnectResult(true);
+      client.onDisconnectResult(true);
     } else if (isConnecting) {
-      hrClient.onConnectResult(false);
+      client.onConnectResult(false);
     } else if (isConnected) {
-      hrClient.onConnectResult(false);
+      client.onConnectResult(false);
     }
   }
 

hrdevice/src/org/runnerup/hr/RetryingHRProviderProxy.java

@@ -229,7 +229,12 @@ public void onCloseResult(boolean ok) {
             }
             attempt++;
             if (attempt >= 10) {
-              RetryingHRProviderProxy.this.log(from + ", attempt: " + attempt);
+              RetryingHRProviderProxy.this.log(from + ", attempt: " + attempt + " => give up");
+              registerDefault();
+              HRClient c = RetryingHRProviderProxy.this.client;
+              if (c != null) {
+                c.onConnectResult(false);
+              }
               return;
             }
             handler.postDelayed(
@@ -337,7 +342,7 @@ public int getBatteryLevel() {
   @Override
   public void log(HRProvider src, String msg) {
     String extra = (client == null) ? "Log w/o client: " : "";
-    Log.d(src.getLogName(), "KESO: " + extra + msg);
+    Log.d(src.getLogName(), extra + msg);
     if (client != null) {
       if (Looper.myLooper() == Looper.getMainLooper()) {
         client.log(src, msg);