android: fix for app coming to foreground

litclimbing · web-flow · commit ca4a1d8ca38d · 2022-02-03T15:56:43.000-08:00
When an app goes to the background, onBlockedStatusChanged is called with true and then called with false when it comes back to the foreground. The function onAvailable isn't called in this case and the connection wasn't being reset. Closes grpc#8850 I noticed the comment that this is used for API versions 24+ but onBlockedStatusChanged was added in 29. I'm not sure if some kind of guard needs to be added or not. https://developer.android.com/reference/android/net/ConnectivityManager.NetworkCallback#onBlockedStatusChanged(android.net.Network,%20boolean)
diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java
@@ -297,6 +297,11 @@ private class DefaultNetworkCallback extends ConnectivityManager.NetworkCallback
       public void onAvailable(Network network) {
         delegate.enterIdle();
       }
+      @Override
+      public void onBlockedStatusChanged (Network network, boolean blocked) {
+        if (!blocked)
+          delegate.enterIdle();
+      }
     }
 
     /** Respond to network changes. Only used on API levels < 24. */

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,11 @@ private class DefaultNetworkCallback extends ConnectivityManager.NetworkCallback`
`297`	`297`	`public void onAvailable(Network network) {`
`298`	`298`	`delegate.enterIdle();`
`299`	`299`	`}`
	`300`	`+ @Override`
	`301`	`+ public void onBlockedStatusChanged (Network network, boolean blocked) {`
	`302`	`+ if (!blocked)`
	`303`	`+ delegate.enterIdle();`
	`304`	`+ }`
`300`	`305`	`}`
`301`	`306`
`302`	`307`	`/** Respond to network changes. Only used on API levels < 24. */`