-
Notifications
You must be signed in to change notification settings - Fork 207
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: catch registerReceiver exceptions to prevent rare crashes
- Loading branch information
1 parent
49a03cc
commit b22381f
Showing
8 changed files
with
113 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
bugsnag-android-core/src/main/java/com/bugsnag/android/ContextExtensions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package com.bugsnag.android | ||
|
||
import android.content.BroadcastReceiver | ||
import android.content.Context | ||
import android.content.Intent | ||
import android.content.IntentFilter | ||
import android.os.RemoteException | ||
|
||
/** | ||
* Calls [Context.registerReceiver] but swallows [SecurityException] and [RemoteException] | ||
* to avoid terminating the process in rare cases where the registration is unsuccessful. | ||
*/ | ||
internal fun Context.registerReceiverSafe( | ||
receiver: BroadcastReceiver?, | ||
filter: IntentFilter?, | ||
logger: Logger? = null | ||
): Intent? { | ||
try { | ||
return registerReceiver(receiver, filter) | ||
} catch (exc: SecurityException) { | ||
logger?.w("Failed to register receiver", exc) | ||
} catch (exc: RemoteException) { | ||
logger?.w("Failed to register receiver", exc) | ||
} | ||
return null | ||
} | ||
|
||
/** | ||
* Calls [Context.unregisterReceiver] but swallows [SecurityException] and [RemoteException] | ||
* to avoid terminating the process in rare cases where the registration is unsuccessful. | ||
*/ | ||
internal fun Context.unregisterReceiverSafe( | ||
receiver: BroadcastReceiver?, | ||
logger: Logger? = null | ||
) { | ||
try { | ||
unregisterReceiver(receiver) | ||
} catch (exc: SecurityException) { | ||
logger?.w("Failed to register receiver", exc) | ||
} catch (exc: RemoteException) { | ||
logger?.w("Failed to register receiver", exc) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
bugsnag-android-core/src/test/java/com/bugsnag/android/ContextExtensionsKtTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
package com.bugsnag.android | ||
|
||
import android.content.BroadcastReceiver | ||
import android.content.Context | ||
import android.content.IntentFilter | ||
import org.junit.Assert.assertEquals | ||
import org.junit.Test | ||
import org.junit.runner.RunWith | ||
import org.mockito.Mock | ||
import org.mockito.Mockito.`when` | ||
import org.mockito.Mockito.times | ||
import org.mockito.Mockito.verify | ||
import org.mockito.junit.MockitoJUnitRunner | ||
|
||
@RunWith(MockitoJUnitRunner::class) | ||
class ContextExtensionsKtTest { | ||
|
||
@Mock | ||
lateinit var context: Context | ||
|
||
@Mock | ||
lateinit var receiver: BroadcastReceiver | ||
|
||
@Mock | ||
lateinit var filter: IntentFilter | ||
|
||
@Test | ||
fun registerReceiverSafe() { | ||
context.registerReceiverSafe(receiver, filter) | ||
verify(context, times(1)).registerReceiver(receiver, filter) | ||
} | ||
|
||
@Test | ||
fun registerReceiverSecurityException() { | ||
val logger = InterceptingLogger() | ||
`when`(context.registerReceiver(receiver, filter)).thenThrow(SecurityException()) | ||
context.registerReceiverSafe(receiver, filter, logger) | ||
assertEquals("Failed to register receiver", logger.msg) | ||
} | ||
|
||
@Test | ||
fun unregisterReceiverSafe() { | ||
context.unregisterReceiverSafe(receiver) | ||
verify(context, times(1)).unregisterReceiver(receiver) | ||
} | ||
|
||
@Test | ||
fun unregisterReceiverSecurityException() { | ||
val logger = InterceptingLogger() | ||
`when`(context.unregisterReceiver(receiver)).thenThrow(SecurityException()) | ||
context.unregisterReceiverSafe(receiver, logger) | ||
assertEquals("Failed to register receiver", logger.msg) | ||
} | ||
} |