Resolve conflicts with release

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,26 +4,26 @@ about: Create a report to help us improve
 
 ---
 
-## :loudspeaker: Describe the bug
-*A clear and concise description of what the bug is.*
+## :writing_hand: Describe the bug
+<!-- A clear and concise description of what the bug is. -->
 
-## :bomb: To Reproduce
-*Steps to reproduce the behavior:*
+## :bomb: Steps to reproduce
+<!-- How we can reproduce the behavior: -->
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-### :wrench: Expected behavior
-*A clear and concise description of what you expected to happen.*
+## :wrench: Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
 
 ## :camera: Screenshots
-*If applicable, add screenshots to help explain your problem.*
+<!-- If applicable, add screenshots to help explain your problem. -->
 
-## :iphone: Smartphone
- - Device: *e.g. Nexus 6P*
- - OS: *e.g. 7.1.1*
- - Lib version: *e.g. 2.0.2*
+## :iphone: Tech info
+ - Device: <!-- e.g. Nexus 6P -->
+ - OS: <!-- e.g. 7.1.1 -->
+ - Chucker version: <!-- e.g. 3.1.2 -->
 
 ## :page_facing_up: Additional context
-*Add any other context about the problem here.*
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,18 +4,19 @@ about: Suggest an idea for this project
 
 ---
 
-## :warning: Is your feature request related to a problem? Please describe.
-*A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]*
+## :warning: Is your feature request related to a problem? Please describe
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
-## :dart: Describe the solution you'd like
-*A clear and concise description of what you want to happen.*
+## :bulb: Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
 
 ## :bar_chart: Describe alternatives you've considered
-*A clear and concise description of any alternative solutions or features you've considered.*
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 ## :page_facing_up: Additional context
-*Add any other context or screenshots about the feature request here.*
+<!-- Add any other context or screenshots about the feature request here. -->
 
-## :pencil: Do you want to develop this feature yourself?
+## :raising_hand: Do you want to develop this feature yourself?
+<!-- Put an `x` symbol into braces of desired choice. -->
 - [ ] Yes
-- [X] No
+- [ ] No

.github/PULL_REQUEST_TEMPLATE

@@ -1,20 +1,20 @@
 ## :camera: Screenshots
-*Show us what you've changed, we love images.*
+<!-- Show us what you've changed, we love images. -->
 
 ## :page_facing_up: Context
-*Why did you change something? Is there an [issue](https://github.com/ChuckerTeam/chucker/issues) to link here? Or an extarnal link?*
+<!-- Why did you change something? Is there an [issue](https://github.com/ChuckerTeam/chucker/issues) to link here? Or an external link? -->
 
 ## :pencil: Changes
-*Which code did you change? How?*
+<!-- Which code did you change? How? -->
 
 ## :paperclip: Related PR
-*PR that blocks this one, or the ones blocked by this PR*
+<!-- PR that blocks this one, or the ones blocked by this PR -->
 
-## :warning: Breaking
-*Is there something breaking in the API? Any class or method signature changed?*
+## :no_entry_sign: Breaking
+<!-- Is there something breaking the API? Any class or method signature changed? -->
 
-## :pencil: How to test
-*Is there a special case to test your changes?*
+## :hammer_and_wrench: How to test
+<!-- Is there a special case to test your changes? -->
 
-## :crystal_ball: Next steps
-*Do we have to plan something else after the merge?*
+## :stopwatch: Next steps
+<!-- Do we have to plan something else after the merge? -->

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,20 @@
+name: Validate Gradle Wrapper
+on: 
+ push:
+ branches:
+ - develop 
+ - release
+ pull_request:
+ branches: 
+ - '*'
+
+jobs:
+ validation:
+ name: Validation
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout latest code
+ uses: actions/checkout@v2
+ - name: Validate Gradle Wrapper
+ uses: gradle/wrapper-validation-action@v1
+

.github/workflows/pre-merge.yaml

@@ -0,0 +1,18 @@
+name: Pre Merge Checks
+on: 
+ push:
+ branches:
+ - develop 
+ - release
+ pull_request:
+ branches: 
+ - '*'
+
+jobs:
+ gradle:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout Repo
+ uses: actions/checkout@v2
+ - name: Run Gradle tasks
+ run: ./gradlew clean ktlintCheck lint detekt build test

CHANGELOG.md

@@ -1,5 +1,57 @@
 # Change Log
 
+## Version 3.2.0 *(2020-04-04)*
+
+This is a new minor release with numerous internal changes.
+
+### Summary of changes
+
+* Chucker won't load the whole response into memory anymore, but will mutlicast it with the help of temporary files. It allows to avoid issues with OOM, like in reported in [#218].
+This change also allows to avoid problems with Chucker consuming responses, like reported in [#242].
+* Added a red open padlock icon to clearly indicate HTTP requests in transactions list.
+* Added TLS info (version and cipher suite) into `Overview` tab.
+* Added ability to encode/decode URLs.
+* Added RTL support.
+* Switched from AsyncTasks to Kotlin coroutines.
+* Switched to [ViewBinding](https://developer.android.com/topic/libraries/view-binding).
+* Bumped targetSDK to 29.
+* Greatly increased test coverage (we will add exact numbers and reports pretty soon).
+
+### Bugfixes
+
+* Fix for [#218] with OOM exceptions on big responses.
+* Fix for [#242] with Chucker throwing exceptions when used as `networkInterceptor()`.
+* Fix for [#240] with HttpHeader serialisation exceptions when obfuscation is used.
+* Fix for [#254] with response body search being case-sensitive.
+* Fix for [#255] with missing search icon on Response tab.
+* Fix for [#241] with overlapping texts.
+
+### Dependency updates
+
+* Added kotlinx-coroutines-core 1.3.5
+* Added kotlinx-coroutines-android 1.3.5
+* Updated Kotlin to 1.3.71
+* Updated Android Gradle plugin to 3.6.1
+* Updated Room to 2.2.5
+* Updated OkHttp to 3.12.10
+* Updated Detekt to 1.7.3
+* Updated Dokka to 0.10.1
+* Updated KtLint plugin to 9.2.1
+* Updated MaterialComponents to 1.1.0
+* Updated Gradle to 6.3
+
+### Credits
+
+This release was possible thanks to the contribution of:
+
+@adammasyk
+@cortinico
+@CuriousNikhil
+@hitanshu-dhawan
+@MiSikora
+@technoir42
+@vbuberen
+
 ## Version 3.1.2 *(2020-02-09)*
 
 This is hot-fix release to fix multiple issues introduced in `3.1.0`.
@@ -16,6 +68,13 @@ This is hot-fix release to fix multiple issues introduced in `3.1.0`.
 * Fixed an [issue](https://github.com/ChuckerTeam/chucker/pull/222) with crash when user taps Clear from notification shade while the original app is already dead.
 * Fixed an [issue](https://github.com/ChuckerTeam/chucker/pull/223) with possible NPEs.
 
+### Credits
+
+This release was possible thanks to the contribution of:
+
+@MiSikora
+@vbuberen
+
 ## Version 3.1.1 *(2020-01-25)*
 
 This is hot-fix release to fix issue introduced in `3.1.0`.
@@ -24,6 +83,12 @@ This is hot-fix release to fix issue introduced in `3.1.0`.
 
 - Fixed an [issue](https://github.com/ChuckerTeam/chucker/issues/203) introduced in 3.1.0 where some of response bodies were shown as `null` and their sizes were 0 bytes.
 
+### Credits
+
+This release was possible thanks to the contribution of:
+
+@cortinico
+
 ## Version 3.1.0 *(2020-01-24)*
 
 ### This version shouldn't be used as dependency due to [#203](https://github.com/ChuckerTeam/chucker/issues/203). Use 3.1.1 instead.
@@ -297,3 +362,9 @@ Initial release.
 [#196]: https://github.com/ChuckerTeam/chucker/pull/196
 [#198]: https://github.com/ChuckerTeam/chucker/pull/198
 [#201]: https://github.com/ChuckerTeam/chucker/pull/201
+[#218]: https://github.com/ChuckerTeam/chucker/issues/218
+[#242]: https://github.com/ChuckerTeam/chucker/issues/242
+[#240]: https://github.com/ChuckerTeam/chucker/pull/240
+[#254]: https://github.com/ChuckerTeam/chucker/issues/254
+[#255]: https://github.com/ChuckerTeam/chucker/issues/255
+[#241]: https://github.com/ChuckerTeam/chucker/issues/241

README.md

@@ -1,5 +1,5 @@
 # Chucker
-[![JitPack](https://jitpack.io/v/ChuckerTeam/Chucker.svg)](https://jitpack.io/#ChuckerTeam/Chucker) [![Build Status](https://travis-ci.org/ChuckerTeam/chucker.svg?branch=master)](https://travis-ci.org/ChuckerTeam/chucker) ![License](https://img.shields.io/github/license/ChuckerTeam/Chucker.svg) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-orange.svg)](http:https://makeapullrequest.com) [![Join the chat at https://kotlinlang.slack.com](https://img.shields.io/badge/slack-@kotlinlang/chucker-yellow.svg?logo=slack)](https://kotlinlang.slack.com/archives/CRWD6370R) [![Android Weekly](https://img.shields.io/badge/Android%20Weekly-%23375-blue.svg)](https://androidweekly.net/issues/issue-375)
+[![JitPack](https://jitpack.io/v/ChuckerTeam/Chucker.svg)](https://jitpack.io/#ChuckerTeam/Chucker) ![Pre Merge Checks](https://github.com/ChuckerTeam/chucker/workflows/Pre%20Merge%20Checks/badge.svg?branch=develop) ![License](https://img.shields.io/github/license/ChuckerTeam/Chucker.svg) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-orange.svg)](http:https://makeapullrequest.com) [![Join the chat at https://kotlinlang.slack.com](https://img.shields.io/badge/slack-@kotlinlang/chucker-yellow.svg?logo=slack)](https://kotlinlang.slack.com/archives/CRWD6370R) [![Android Weekly](https://img.shields.io/badge/Android%20Weekly-%23375-blue.svg)](https://androidweekly.net/issues/issue-375)
 
 _A fork of [Chuck](https://github.com/jgilfelt/chuck)_
 
@@ -20,7 +20,7 @@ _A fork of [Chuck](https://github.com/jgilfelt/chuck)_
 * [Acknowledgments](#acknowledgments-)
 * [License](#license-)
 
-Chucker simplifies the inspection of **HTTP(S) requests/responses**, and **Throwables** fired by your Android App. Chucker works as a **OkHttp Interceptor** persisting all those events inside your application, and providing a UI for inspecting and sharing their content.
+Chucker simplifies the inspection of **HTTP(S) requests/responses**, and **Throwables** fired by your Android App. Chucker works as an **OkHttp Interceptor** persisting all those events inside your application, and providing a UI for inspecting and sharing their content.
 
 Apps using Chucker will display a **push notification** showing a summary of ongoing HTTP activity and Throwables. Tapping on the notification launches the full Chucker UI. Apps can optionally suppress the notification, and launch the Chucker UI directly from within their own interface.
 
@@ -42,8 +42,8 @@ repositories {
 
 ```groovy
 dependencies {
- debugImplementation "com.github.ChuckerTeam.Chucker:library:3.1.2"
- releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.1.2"
+ debugImplementation "com.github.ChuckerTeam.Chucker:library:3.2.0"
+ releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.2.0"
 }
 ```
 
@@ -119,7 +119,7 @@ try {
 
 ### Redact-Header 👮‍♂️
 
-**Warning** The data generated and stored when using Chucker may contain sensitive information such as Authorization or Cookie headers, and the contents of request and response bodies. 
+**Warning** The data generated and stored when using Chucker may contain sensitive information such as Authorization or Cookie headers, and the contents of request and response bodies.
 
 It is intended for **use during development**, and not in release builds or other production deployments.
 
@@ -163,13 +163,13 @@ If you're looking for the **latest stable version**, you can always find it on t
 * Why are retries and redirects not being captured discretely?
 * Why are my encoded request/response bodies not appearing as plain text?
 
-Please refer to [this section of the OkHttp wiki](https://github.com/square/okhttp/wiki/Interceptors#choosing-between-application-and-network-interceptors). You can choose to use Chucker as either an application or network interceptor, depending on your requirements.
+Please refer to [this section of the OkHttp documentation](https://square.github.io/okhttp/interceptors/). You can choose to use Chucker as either an application or network interceptor, depending on your requirements.
 
 ## Contributing 🤝
 
-We're offering support for Chucker on the [#chucker](https://kotlinlang.slack.com/archives/CRWD6370R) channel on [kotlinlang.slack.com](https://kotlinlang.slack.com/). Come and joing the conversation over there.
+We're offering support for Chucker on the [#chucker](https://kotlinlang.slack.com/archives/CRWD6370R) channel on [kotlinlang.slack.com](https://kotlinlang.slack.com/). Come and join the conversation over there.
 
-**We're looking for contributors! Don't be shy.** 😁 Feel free to open issues/pull requests to help me improve this project.
+**We're looking for contributors! Don't be shy.** 😁 Feel free to open issues/pull requests to help us improve this project.
 
 * When reporting a new Issue, make sure to attach **Screenshots**, **Videos** or **GIFs** of the problem you are reporting.
 * When submitting a new PR, make sure tests are all green. Write new tests if necessary.

build.gradle

@@ -1,33 +1,37 @@
 buildscript {
  ext {
- kotlinVersion = '1.3.61'
- androidGradleVersion = '3.5.3'
+ kotlinVersion = '1.3.71'
+ androidGradleVersion = '3.6.1'
+ coroutineVersion = '1.3.5'
 
  // Google libraries
  appCompatVersion = '1.1.0'
  constraintLayoutVersion = '1.1.3'
- materialComponentsVersion = '1.1.0-rc02'
- roomVersion = '2.2.3'
+ materialComponentsVersion = '1.1.0'
+ roomVersion = '2.2.5'
  lifecycleVersion = '2.2.0'
+ androidXCoreVersion = '2.1.0'
 
  // Publishing
  androidMavenGradleVersion = '2.1'
 
  // Networking
  gsonVersion = '2.8.6'
- okhttp3Version = '3.12.6'
+ okhttp3Version = '3.12.10'
  retrofitVersion = '2.6.4'
 
  // Debug and quality control
- detektVersion = '1.4.0'
- dokkaVersion = '0.10.0'
- ktLintVersion = '9.1.1'
- leakcanaryVersion = '2.1'
+ detektVersion = '1.7.4'
+ dokkaVersion = '0.10.1'
+ ktLintVersion = '0.36.0'
+ ktLintGradleVersion = '9.2.1'
+ leakcanaryVersion = '2.2'
 
  // Testing
- junitGradlePluignVersion = '1.3.1.1'
- junitVersion = '5.4.2'
+ junitGradlePluignVersion = '1.6.0.0'
+ junitVersion = '5.6.0'
  mockkVersion = '1.9.3'
+ truthVersion = '1.0.1'
  }
 
  repositories {
@@ -43,7 +47,7 @@ buildscript {
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
  classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
  classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
- classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktLintVersion"
+ classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktLintGradleVersion"
  }
 }
 
@@ -63,6 +67,6 @@ task clean(type: Delete) {
 
 ext {
  minSdkVersion = 16
- targetSdkVersion = 28
- compileSdkVersion = 28
+ targetSdkVersion = 29
+ compileSdkVersion = 29
 }

gradle.properties

@@ -16,9 +16,11 @@ org.gradle.jvmargs=-Xmx1536m
 # http:https://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 
-VERSION_NAME=3.1.2
-# 3*100*100 + 1*100 + 2 => 30102
-VERSION_CODE=30102
+android.useAndroidX=true
+
+VERSION_NAME=3.2.0
+# 3*100*100 + 2*100 + 0 => 30200
+VERSION_CODE=30200
 GROUP=com.github.chuckerteam.chucker
 
 POM_REPO_NAME=Chucker