Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for NPE in NotificationHelper #223

Merged
merged 2 commits into from
Feb 4, 2020

Conversation

vbuberen
Copy link
Collaborator

@vbuberen vbuberen commented Feb 2, 2020

📄 Context

Fix, which should protect from issues, like #168 in NotificationHelper. Checks for transaction in transactionBuffer being null should protect from cases described in the mentioned issue.

📝 Changes

Add explicit check for null value in transactionBuffer.

@vbuberen vbuberen added the bug Something isn't working label Feb 2, 2020
@vbuberen vbuberen added this to the 3.2.0 milestone Feb 2, 2020
Copy link
Member

@cortinico cortinico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really a blocker, but is probably better to extract that transactionBuffer.valueAt(i) now?

@@ -107,7 +107,7 @@ internal class NotificationHelper(val context: Context) {
synchronized(transactionBuffer) {
var count = 0
(transactionBuffer.size() - 1 downTo 0).forEach { i ->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about something like:

(transactionBuffer.size() - 1 downTo 0).forEach { i ->
                    val item = transactionBuffer.valueAt(i)
                    if (item != null && count < BUFFER_SIZE) {
                        if (count == 0) {
                            builder.setContentText(item.notificationText)
                        }
                        inboxStyle.addLine(item.notificationText)
                    }
                    count++
                }

@vbuberen vbuberen merged commit 1a630fa into ChuckerTeam:develop Feb 4, 2020
@vbuberen vbuberen mentioned this pull request Feb 4, 2020
@vbuberen vbuberen modified the milestones: 3.2.0, 3.1.2 Feb 9, 2020
vbuberen added a commit that referenced this pull request Feb 9, 2020
* Remove scroll flags (#210)
* Fix/gradle properties (#211)
* Allow Gradle parallel build
* Fix version name
* Fix for curl command (#214)
* Fix R8 minification crash on TransactionViewModel creation. (#219)
* Big resources renaming (#216)
* Fix clear action crash when application is dead (#222)
* Fix for crash on Save transaction action (#221)
* Show warning is transaction is null, fix crash in Save action
* Uncomment sample transactions
* Replace multiple returning with multiple throw due to detekt issue
* Add message into IOException, update string for request being not ready
* Fix for NPE in NotificationHelper (#223)
* Add additional check fo transaction being not null before getting its notificationText
* Extract transaction item from transactionBuffer
* ViewModel refactoring (#220)
* Update ViewModel dependency, refactor TransactionViewModel
* Dependencies clean up
* Switch to ViewModel on the main screen
* Fix depleting bytes from the response. (#226)
* Use HttpUrl instead of Uri for parsing URL data.
* Do not read image sources directly from the response.
* Simplify gzip logic.
* Move gzip checks from IoUtils to OkHttpUtils.
* Remove unused 'Response.hasBody()' extension.
* Update library/src/main/java/com/chuckerteam/chucker/internal/support/OkHttpUtils.kt
* Revert resource renaming (#227)
* Revert renaming
* Add changelogs for 3.1.2 (#230)
vbuberen added a commit that referenced this pull request Apr 4, 2020
* Remove scroll flags (#210)
* Fix/gradle properties (#211)
* Allow Gradle parallel build
* Fix version name
* Fix for curl command (#214)
* Fix R8 minification crash on TransactionViewModel creation. (#219)
* Big resources renaming (#216)
* Fix clear action crash when application is dead (#222)
* Fix for crash on Save transaction action (#221)
* Show warning is transaction is null, fix crash in Save action
* Uncomment sample transactions
* Replace multiple returning with multiple throw due to detekt issue
* Add message into IOException, update string for request being not ready
* Fix for NPE in NotificationHelper (#223)
* Add additional check fo transaction being not null before getting its notificationText
* Extract transaction item from transactionBuffer
* ViewModel refactoring (#220)
* Update ViewModel dependency, refactor TransactionViewModel
* Dependencies clean up
* Switch to ViewModel on the main screen
* Fix depleting bytes from the response. (#226)
* Use HttpUrl instead of Uri for parsing URL data.
* Do not read image sources directly from the response.
* Simplify gzip logic.
* Move gzip checks from IoUtils to OkHttpUtils.
* Remove unused 'Response.hasBody()' extension.
* Update library/src/main/java/com/chuckerteam/chucker/internal/support/OkHttpUtils.kt
* Revert resource renaming (#227)
* Revert renaming
* Add changelogs for 3.1.2 (#230)
vbuberen added a commit that referenced this pull request Apr 4, 2020
* Remove scroll flags (#210)

* Fix/gradle properties (#211)

* Allow Gradle parallel build
* Fix version name

* Fix for curl command (#214)

* Fix R8 minification crash on TransactionViewModel creation. (#219)

* Big resources renaming (#216)

* Fix clear action crash when application is dead (#222)

* Fix for crash on Save transaction action (#221)

* Show warning is transaction is null, fix crash in Save action

* Uncomment sample transactions

* Replace mulptiple returning with multiple throw due to detekt issue

* Add message into IOException, update string for request being not ready

* Fix for NPE in NotificationHelper (#223)

* Add additional check fo transaction being not null before getting its notificationText

* Extract transaction item from transactionBuffer

* ViewModel refactoring (#220)

* Update ViewModel dependency, refactor TransactionViewModel
* Dependencies clean up
* Switch to ViewModel on the main screen

* Fix depleting bytes from the response. (#226)

* Use HttpUrl instead of Uri for parsing URL data.
* Do not read image sources directly from the response.
* Simplify gzip logic.
* Move gzip checks from IoUtils to OkHttpUtils.
* Remove unused 'Response.hasBody()' extension.
* Update library/src/main/java/com/chuckerteam/chucker/internal/support/OkHttpUtils.kt

* Revert resource renaming (#227)

* Revert renaming

* Add changelgos for 3.1.2 (#230)

* Add missing  section to release 3.1.1 and 3.1.2 (#232)

* Update Github templates (#235)

* Update templates
* Remove redundant dot
* Remove default `no` from the checkbox

* Switch to platform defined HTTP code constants (#238)

* Add instruction for checkbox selection (#237)

* Fix HttpHeader serialization when obfuscation is enabled (#240)

* Update README (#243)

* Add Action to validate the Gradle Wrapper (#245)

* Gradle to 6.2 (#247)

* Do not refresh transaction when it is not being affected. (#246)

* Do not refresh transaction when it is not being affected.
* Use correct null-aware comparison for HttpTransaction.

* Add switching between encoded and decoded URL formats. (#233)

* Add switching between encoded and decoded URL formats.
* Make URL encoding transaction specific.
* Change test name for upcoming #244 PR.
* Use LiveDataRecord for combineLatest tests.
* Properly switch encoding and decoding URL.
* Show encoding icon only when it is viable.
* Add encoded URL samples to HttpBinClient.
* Avoid using 'this' scoping mechanism for URL.

* Fix typo in feature request comment (#251)

* RTL Support (#208)

* Remove ltr forcing and replace ScrollView in Overview
* Replace Overview layout, add rtl support for it
* Add textDirection and textAlignment property for API 21+
* Fix host textview constraints
* Replace android:src with app:srcCompat
* Update ids for layouts to avoid clashes
* Update Material components to stable
* Remove supportsRTL tag from Manifest, update Gradle plugin
* Styles update
* Remove supportsRTL from library manifest
* Revert usage of supportVectorDrawables to avoid crashes on APIs 16-19 due to notifications icons
* Fix lint issue with vector drawable

* Response search fixes (#256)

* Fix response search to be case insensitive
* Add minimum required symbols
* Fix invalid options menu in response fragment

* Feature/tls info (#252)

* Add UI for TLS info

* Implement logic for retrieving TLS info

* Address code review feedback

* Switch views to ViewBinding (#253)

* Switch to ViewBinding in activities
* Switch to ViewBinding in ErrorsAdapter, add formattedDate field into Throwable models
* Transaction adapter switch to ViewBinding
* Remove variable for formatted date from models
* Switch to ViewBinding in TransactionPayloadAdapter
* Switch to ViewBinding in TransactionPaayload and TransactionOverviewFragments
* Switch list fragments to ViewBinding
* Fix link for tutorial opening
* Rename views
* Address code review feedback
* Hide SSL field if isSSL is null

* Libs update (#260)

* Update tools versions
* JUnit update

* Feature/truth (#258)

* Add Truth, update part of test classes
* Convert other tests to use Truth, fix date parser test
* Add Truth assertions to FormatUtilsTest, fix ktlint issue
* Update assertions to a proper syntax

* Add missing ThrowableViewModel (#257)

* Add Error ViewModel, update title in TransactionActivity in onCreate
* Switch from errors to throwable naming to have a uniform naming style
* Rename toolbar title

* Migrating from Travis to GH Actions (#262)

* Setup GH Actions

* Run only on Linux

* Remove Travis File

* Run only gradlew directly

* Update targetSDK and Kotlin (#264)

* Add stale builds canceller (#265)

* Add filters
* Update Gradle wrapper validation workflow
* Update pre-merge workflow

* Fixed various Lints (#268)

* fixed typos
* fixed KDocs

* Replace Travis badge with GH Actions badge (#269)

* Remove redundant JvmName (#274)

* Fix margins and paddings for payload items (#277)

* Add selective interception. (#279)

* Add selective interception.
* Update README.md.
* Align formatting in README with other points.
* Avoid header name duplication.
* Strip interception header also in the no-op library.

* UX improvements (#275)

* Add icon for non-https transactions
* Update secondary color to be more contrast
* Simplify protocol resources setting

* Add tests to format utils (#281)

* add tests to format utils

* fixes after code review

* formatting fix

Co-authored-by: adammasyk <[email protected]>

* format utils test refactor (#285)

* format utils test refactor
* share text test refactor

* Migrate to Kotlin Coroutines (#270)

* Add coroutine as a dependency in build.gradle
* Migrate AsyncTasks to kotlin coroutines
* Migrate executors with the coroutines in repositories

* Multi cast upstream response for Chucker consumption. (#267)

* Multi cast response upstream for Chucker consumption.

* Read buffer prefix before potentially gunzipping it.

* Inform Chucker about unprocessed responses.

* Simplify multi casting logic.

* Move read offset to a variable.

* Inline one-line method.

* Give better control over TeeSource read results.

* Add documentation to TeeSource.

* Close side channel when capacity is exceeded.

Co-authored-by: Volodymyr Buberenko <[email protected]>

* Remove unnecessary mock method. (#289)

* removed redundant Gson configurations (#290)

* increased test coverage for format utils (#291)

Co-authored-by: Karthik R <[email protected]>

* added few test cases for json formatting (#295)

* Properly handle unexhausted network responses (#288)

* Handle properly not consumed upstream body.
* Handle IO issues while reading from file.

* Update dependencies (#296)

* Update depencies

* Update OkHttp to 3.12.10

* Handle empty and missing response bodies. (#250)

* Add failing test cases.
* Remove unused const.
* Gzip response body if it was gunzipped.
* Add test cases for regular bodies in Chucker.
* Fix rule formatting.
* Use proper name for application interceptor.
* Return original response downstream.
* Account for no content with gzip encoding.
* Use Truth for Chucker tests.
* Honor empty plaintext bodies.
* Revert changes to HttpBinClient.
* Update library/src/test/java/com/chuckerteam/chucker/ChuckerInterceptorDelegate.kt
* Update library/src/main/java/com/chuckerteam/chucker/internal/support/OkHttpUtils.kt
Co-authored-by: Nicola Corti <[email protected]>
Co-authored-by: Volodymyr Buberenko <[email protected]>

* Add hasFixed size to RecyclerViews (#297)

* Detekt to 1.7.4 (#299)

* Revert "Add selective interception. (#279)" (#300)

This reverts commit d14ed64.

* Prepare 3.2.0 (#298)

* Update versions info

* Update Changelog

* Fix links and update date

Co-authored-by: Michał Sikora <[email protected]>
Co-authored-by: Nicola Corti <[email protected]>
Co-authored-by: Sergey Chelombitko <[email protected]>
Co-authored-by: Michał Sikora <[email protected]>
Co-authored-by: Hitanshu Dhawan <[email protected]>
Co-authored-by: adammasyk <[email protected]>
Co-authored-by: adammasyk <[email protected]>
Co-authored-by: Nikhil Chaudhari <[email protected]>
Co-authored-by: karthik rk <[email protected]>
Co-authored-by: Karthik R <[email protected]>
@vbuberen vbuberen deleted the fix/notifications_npe branch May 23, 2020 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants