Commit 3f4d5be
temp+fix: Android In-App Browser Crash (#22212)
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->
## **Description**
The app crashes on Android when users grant **camera + microphone**
permissions through the in-app browser (e.g., visiting
https://permission.site/).
Root Cause:
The WebView permission handling code had a fundamental architectural
flaw when multiple permissions (camera + microphone) were requested
simultaneously:
Old behavior: Showed separate dialogs for each permission (one for
camera, one for microphone)
Each dialog's "Allow" button independently called request.grant()
Android's WebView API only allows calling grant() or deny() once per
permission request
When the user clicked "Allow" on the second dialog → CRASH: "Either
grant() or deny() has been already called"
Solution:
Rewrote the permission handling logic in RNCWebChromeClient.java:
Changed permission handling to show ONE dialog for all permissions:
- "Allow example.com to use your camera and microphone?"
- Call grant() only once with all permissions together
- Added error handling to prevent crashes in edge cases
Android build for this PR:
https://app.bitrise.io/build/560c02e8-611e-4bfd-a24c-34e69751c86b?tab=artifacts
PR to browser:
MetaMask/react-native-webview-mm#72
## **Changelog**
<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`
If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`
(This helps the Release Engineer do their job more quickly and
accurately)
-->
CHANGELOG entry:null
## **Related issues**
Fixes: #22162
## **Manual testing steps**
```gherkin
Feature: Fix Android double permission bug on webview
Scenario: App does not crash when user grant/deny camera + microphone permission
Given user navigates to website https://permission.site in website
When user select Camera + Microphone
Then user is able give/deny permission to Camera and Microphone without app crashing
```
## **Screenshots/Recordings**
<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->
### **Before**
Android Before

### **After**
Android After

<!-- [screenshots/recordings] -->
## **Pre-merge author checklist**
- [x] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
## **Pre-merge reviewer checklist**
- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> Consolidates Android WebView permission flow into a single dialog with
a single grant call for multiple resources, adds error handling, and
delivers via a Yarn patch of @metamask/react-native-webview.
>
> - **Android WebView (`RNCWebChromeClient.java`)**:
> - Show a single confirmation dialog for multiple already-OS-granted
permissions with a combined message.
> - Aggregate requested resources and call `request.grant()` once; map
`CAMERA` → `RESOURCE_VIDEO_CAPTURE`, `RECORD_AUDIO` →
`RESOURCE_AUDIO_CAPTURE`, handle `RESOURCE_PROTECTED_MEDIA_ID`.
> - Reset state before handling requests; manage
`permissionRequest`/`grantedPermissions` lifecycle; only set
`permissionRequest` when system permissions must be requested.
> - Wrap `grant()` with `try/catch` to ignore `IllegalStateException`
and prevent duplicate grant/deny errors.
> - Minor UX: delay enabling the "Allow" button to avoid accidental
taps.
> - **Dependencies**:
> - Use Yarn patch for `@metamask/react-native-webview@14.5.0` via
`.yarn/patches/...`; update `package.json` and `yarn.lock`.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
7396b7f. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
---------
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>1 parent d6ef94e commit 3f4d5be
File tree
1,959 files changed
+51903
-162716
lines changed- .cursor/rules
- .github
- scripts
- workflows
- .storybook
- .yarn/patches
- android/app
- src/main/java/io/metamask/nativeModules/RNTar
- appwright
- reporters
- tests/performance
- login
- onboarding
- predict
- utils
- app
- actions
- networkConnectionBanner
- settings
- transaction
- animations
- component-library
- components-temp
- ButtonFilter
- __snapshots__
- ConditionalScrollView
- KeyValueRow
- KeyValueLabel
- __snapshots__
- MultichainAccounts
- MultichainAccountSelectorList
- Price/AggregatedPercentage
- Tabs
- TabsList
- __snapshots__
- Tab
- components
- BottomSheets/BottomSheet/foundation/BottomSheetOverlay
- Buttons/Button/variants/ButtonLink
- Checkbox
- Form/TextField/foundation/Input
- __snapshots__
- Toast
- __snapshots__
- components
- Approvals/SwitchChainApproval
- Base/Keypad
- __snapshots__
- Snaps
- SnapUIAddressInput
- __snapshots__
- SnapUIAvatar
- SnapUIRenderer
- __snapshots__
- components
- __snapshots__
- UI
- AccountInfoCard
- AddCustomToken
- __snapshots__
- ApprovalTagUrl
- AssetElement
- __snapshots__
- AssetOverview
- Balance
- __snapshots__
- PriceChart
- Price
- TronEnergyBandwidthDetail
- __snapshots__
- utils
- AssetSearch
- __snapshots__
- Assets
- components/Balance
- hooks/useTrendingRequest
- BalanceEmptyState
- BasicFunctionality/BasicFunctionalityModal
- Bridge
- Views/BridgeView
- __snapshots__
- components
- ApprovalText
- __snapshots__
- BridgeDestNetworkSelector/__snapshots__
- BridgeDestTokenSelector
- __snapshots__
- BridgeSourceNetworkSelector/__snapshots__
- BridgeSourceTokenSelector/__snapshots__
- QuoteCountdownTimer
- QuoteDetailsCard
- __snapshots__
- QuoteDetailsRecipientKeyValueRow
- TokenInputArea
- TokenInsightsSheet
- __snapshots__
- TransactionDetails
- constants
- hooks
- useBridgeQuoteData
- useBridgeQuoteRequest
- useRecipientDisplayData
- useTokensWithBalance
- utils
- BrowserUrlBar
- Card
- Views
- CardAuthentication/__snapshots__
- CardHome
- __snapshots__
- SpendingLimit
- components
- AddFundsBottomSheet
- AssetSelectionBottomSheet
- CardAssetItem/__snapshots__
- CardWarningBox
- Onboarding
- SpendingLimitProgressBar
- hooks
- routes
- sdk
- util
- Carousel
- StackCardEmpty
- StackCard
- animations
- CollectibleMedia
- CollectibleModal
- __snapshots__
- Collectibles/__snapshots__
- ConfirmAddAsset
- __snapshots__
- CustomNetworkSelector
- DeFiPositions
- Earn
- Views
- EarnInputView
- __snapshots__
- EarnLendingDepositConfirmationView
- __snapshots__
- components/DepositInfoSection/__snapshots__
- EarnLendingWithdrawalConfirmationView/__snapshots__
- EarnWithdrawInputView
- __snapshots__
- components
- EarnLendingBalance/__snapshots__
- EarnTokenList
- Tron/ResourceToggle
- EditGasFee1559
- EditGasFeeLegacy
- FundActionMenu
- MultichainTransactionDetailsModal
- NetworkConnectionBanner
- __snapshots__
- NetworkInfo
- NetworkManager
- NetworkMultiSelectorList
- NetworkMultiSelector
- NftGrid
- Notification/ResetNotificationsModal
- OptinMetrics
- __snapshots__
- PermissionsSummary
- Perps
- Debug
- Views
- PerpsCancelAllOrdersView
- PerpsCloseAllPositionsView
- PerpsClosePositionView
- PerpsHeroCardView
- PerpsHomeView
- PerpsMarketDetailsView
- PerpsMarketListView
- components
- PerpsMarketFiltersBar
- PerpsMarketRowSkeleton
- PerpsOrderView
- PerpsPositionsView
- PerpsTPSLView
- PerpsTabView
- PerpsTooltipView
- PerpsTransactionsView
- PerpsWithdrawView
- __mocks__
- components
- LivePriceDisplay
- PerpsAmountDisplay
- PerpsBadge
- PerpsBottomSheetTooltip
- content
- PerpsCandlePeriodSelector
- PerpsCard
- PerpsCloseSummary
- PerpsDeveloperOptionsSection
- PerpsGTMModal
- PerpsHomeHeader
- PerpsHomeSection
- PerpsLeverageBottomSheet
- PerpsLeverage
- PerpsLimitPriceBottomSheet
- PerpsLoadingSkeleton
- PerpsMarketBalanceActions
- PerpsMarketHeader
- PerpsMarketHoursBanner
- PerpsMarketListHeader
- PerpsMarketList
- PerpsMarketRowItem
- PerpsMarketSortDropdowns
- PerpsMarketSortFieldBottomSheet
- PerpsMarketStatisticsCard
- PerpsMarketTabs
- PerpsMarketTypeSection
- PerpsOICapWarning
- PerpsOpenOrderCard
- PerpsOrderHeader
- PerpsOrderTypeBottomSheet
- PerpsPositionCard
- PerpsProgressBar
- PerpsRecentActivityList
- PerpsRowSkeleton
- PerpsSlider
- PerpsStocksCommoditiesBottomSheet
- PerpsStocksCommoditiesDropdown
- PerpsTokenLogo
- PerpsTransactionDetailAssetHero
- PerpsTransactionItem
- PerpsTutorialCard
- PerpsTutorialCarousel
- PerpsWatchlistMarkets
- TradingViewChart
- utils
- constants
- controllers
- providers
- types
- hooks
- stream
- providers
- routes
- selectors
- chartPreferences
- featureFlags
- perpsController
- services
- styles
- types
- utils
- Predict
- components
- MarketListContent
- PredictActivityDetail
- PredictAddFundsSheet
- PredictAmountDisplay
- PredictBalance
- PredictConsentSheet
- PredictDetailsChart
- PredictFeeSummary
- PredictFeedHeader
- PredictKeypad
- PredictMarketList
- PredictMarketMultiple
- PredictMarketOutcome
- PredictMarketSingle
- PredictMarket
- PredictNewButton
- PredictOffline
- PredictPositionDetail
- PredictPositionEmpty
- PredictPositionResolved
- PredictPositionsHeader
- PredictPositions
- PredictPosition
- SearchBox
- constants
- controllers
- hooks
- providers
- polymarket
- safe
- selectors
- featureFlags
- predictController
- services
- types
- utils
- views
- PredictAddFundsModal
- PredictBuyPreview
- PredictFeed
- PredictMarketDetails
- PredictSellPreview
- PredictTabView
- PredictTransactionsView
- ProfilerManager
- Ramp
- Aggregator
- Views
- BuildQuote
- __snapshots__
- OrderDetails
- OrdersList
- Quotes
- SendTransaction
- Settings/__snapshots__
- components
- FiatSelectorModal/__snapshots__
- RegionSelectorModal/__snapshots__
- TokenSelectModal/__snapshots__
- hooks
- orderProcessor
- sdk
- types
- utils
- Deposit
- Views
- AdditionalVerification
- BankDetails
- BasicInfo/__snapshots__
- BuildQuote
- __snapshots__
- EnterAddress
- __snapshots__
- EnterEmail/__snapshots__
- KycProcessing
- Modals
- PaymentMethodSelectorModal
- RegionSelectorModal
- __snapshots__
- StateSelectorModal/__snapshots__
- TokenSelectorModal
- __snapshots__
- WebviewModal
- OrderProcessing
- components/DepositPhoneField
- __snapshots__
- hooks
- sdk
- testUtils
- types
- utils
- hooks
- ReceiveRequest
- Rewards
- Views
- components
- Onboarding
- __tests__
- ReferralDetails
- RewardsReferralCodeTag
- SeasonStatus
- Tabs
- ActivityTab
- LevelsTab
- OverviewTab/WaysToEarn
- hooks
- SearchTokenAutocomplete
- __snapshots__
- SimulationDetails
- SrpInputGrid
- __snapshots__
- Stake
- Views
- StakeConfirmationView/__snapshots__
- UnstakeConfirmationView/__snapshots__
- components
- StakingBalance
- __snapshots__
- StakingConfirmation
- RewardsCard/__snapshots__
- UnstakeTimeCard/__snapshots__
- Swaps
- components
- utils
- SwitchCustomNetwork
- TimeEstimateInfoModal
- TokensEmptyState
- Tokens
- TokenListControlBar
- TokenList
- PortfolioBalance
- TokenListItem
- TokensBottomSheet
- util
- TransactionElement
- TransactionDetails
- __snapshots__
- TransactionHeader
- Transactions
- UrlAutocomplete
- WebsiteIcon
- Views
- AccountActions
- AccountPermissions
- AccountStatus
- __snapshots__
- ActivityView
- AddAsset
- __snapshots__
- components
- AddressSelector
- __snapshots__
- AssetDetails
- AssetDetailsActions
- AssetOptions
- __snapshots__
- Asset
- __snapshots__
- BrowserTab
- Browser
- ChangeInSimulationModal
- ChoosePassword
- __snapshots__
- DetectedTokens
- EditAccountName/__snapshots__
- EnterPasswordSimple
- __snapshots__
- ErrorBoundary
- FeatureFlagOverride
- GasEducationCarousel
- ImportFromSecretRecoveryPhrase
- __snapshots__
- ImportNewSecretRecoveryPhrase
- Login
- __snapshots__
- ManualBackupStep1
- __snapshots__
- ManualBackupStep2
- ManualBackupStep3
- MultichainAccounts
- MultichainAccountConnect
- MultichainAccountsConnectedList
- MultichainPermissionsSummary
- PrivateKeyList
- WalletDetails
- BaseWalletDetails
- hooks
- NFTAutoDetectionModal
- NetworkConnect/NetworkConnectMultiSelector
- __snapshots__
- NetworkSelector
- NetworkSearchTextInput
- __snapshots__
- NftDetails
- NftFullView
- NftOptions
- Notifications
- OptIn
- OnboardingSuccess
- OnboardingSuccessEndAnimation
- __snapshots__
- Onboarding
- OriginSpamModal
- ResetPassword
- __snapshots__
- RevealPrivateCredential
- __snapshots__
- Root
- SDK/SDKSessionsManager
- Settings
- AdvancedSettings
- FiatOnTestnetsFriction
- __snapshots__
- AutoDetectNFTSettings
- AutoDetectTokensSettings
- DeveloperOptions
- __snapshots__
- DisplayNFTMediaSettings
- ExperimentalSettings/__snapshots__
- GeneralSettings
- NetworksSettings
- NetworkSettings
- CustomNetworkView
- __snapshots__
- NotificationsSettings
- NotificationOptionToggle
- SecuritySettings
- Sections
- __snapshots__
- SrpInput
- Input
- __snapshots__
- TokensFullView
- TradeWalletActions
- TrendingView
- UnifiedTransactionsView
- WalletActions
- Wallet
- confirmations
- __mocks__/controllers
- components
- UI
- recipient
- token
- activity/transaction-details-status
- approve-static-simulations
- approve-and-permit2
- increase-decrease-allowance
- blockaid-alert-content
- confirm
- info
- contract-interaction
- custom-amount-info
- perps-deposit-info
- predict-deposit-info
- predict-withdraw-info
- typed-sign-v3v4/simulation/typed-sign-decoded
- pay-token-amount
- predict-confirmations
- predict-claim-amount
- predict-withdraw-balance
- recipient-list
- rows
- account-network-info-row/account-network-info-expanded
- bridge-fee-row
- bridge-time-row
- transactions/gas-fee-details-row
- send
- amount
- recipient
- transactions/custom-amount
- constants
- hooks
- alerts
- gas
- metrics
- pay
- perps-deposit
- send
- signatures
- tokens
- transactions
- ui
- legacy
- Approval
- components/TransactionEditor
- ApproveView/Approve/__snapshots__
- Approve/__snapshots__
- SendFlow
- Amount/__snapshots__
- Confirm
- SendTo
- Send
- components
- ApproveTransactionReview
- VerifyContractDetails
- __snapshots__
- BlockaidBanner
- PersonalSign
- TypedSign
- selectors
- utils
- hooks
- AssetPolling
- DisplayName
- useAccounts
- useMetrics
- useMultichainBalances
- useNetworkConnectionBanner
- useNetworksByNamespace
- constants
- contexts
- core
- Analytics
- Authentication
- BackgroundBridge
- BackupVault
- DeeplinkManager
- Handlers
- ParseManager
- utils
- types
- EngineService
- utils
- Engine
- controllers
- accounts-controller
- app-metadata-controller
- approval-controller
- bridge-controller
- bridge-status-controller
- core-backend
- currency-rate-controller
- defi-positions-controller
- delegation
- gas-fee-controller
- gator-permissions-controller
- identity
- multichain-account-service
- multichain-assets-controller
- multichain-assets-rates-controller
- multichain-balances-controller
- multichain-network-controller
- multichain-transactions-controller
- network-enablement-controller
- notifications
- perps-controller
- predict-controller
- rewards-controller
- services
- seedless-onboarding-controller
- signature-controller
- snaps
- transaction-controller
- event-handlers
- messengers
- accounts-controller-messenger
- app-metadata-controller-messenger
- approval-controller-messenger
- bridge-controller-messenger
- bridge-status-controller-messenger
- core-backend
- cronjob-controller-messenger
- currency-rate-controller-messenger
- defi-positions-controller-messenger
- delegation
- gas-fee-controller-messenger
- gator-permissions-controller-messenger
- identity
- multichain-account-service-messenger
- multichain-assets-controller-messenger
- multichain-assets-rates-controller-messenger
- multichain-balances-controller-messenger
- multichain-network-controller-messenger
- multichain-transactions-controller-messenger
- network-enablement-controller-messenger
- notifications
- perps-controller-messenger
- predict-controller-messenger
- rewards-controller-messenger
- seedless-onboarding-controller-messenger
- signature-controller-messenger
- snaps
- transaction-controller-messenger
- utils
- FontPreloader
- __tests__
- GasPolling
- Multichain
- OAuthService/OAuthLoginHandlers
- RPCMethods
- SDKConnectV2/adapters
- SDKConnect/ConnectionManagement
- SnapKeyring
- Snaps
- permissions
- redux/slices
- bridge
- card
- features/SampleFeature
- analytics
- components
- hooks
- useSampleCounter
- useSampleNetwork
- useSamplePetNamesForm
- useSamplePetNames
- views
- SampleCounterPane
- SampleFeatureDevSettingsEntryPoint
- SampleNetworkDisplay
- __snapshots__
- SamplePetNames
- __snapshots__
- __snapshots__
- controllers
- e2e
- pages
- selectors
- specs
- reducers/sample-counter
- selectors
- sampleFeatureCounter
- samplePetNameController
- hooks
- images
- lib/ppom
- multichain-accounts/messengers/account-tree-controller-messenger
- multichain-bitcoin
- reducers
- collectibles
- fiatOrders
- legalNotices
- networkConnectionBanner
- rewards
- settings
- signatureRequest
- swaps
- selectors
- assets
- earnController/earn
- featureFlagController
- assetsTrendingTokens
- homepage
- networkBlacklist
- ramps
- rewards
- trxStakingEnabled
- multichainAccounts
- multichain
- multisrp
- rewards
- store
- getPersistentState
- migrations
- persistConfig
- validateMigration
- util
- Logger
- address
- bridge/hooks
- date
- feature-flags
- logs/__snapshots__
- networks
- notifications
- hooks
- notification-states
- feature-announcement
- types
- services
- number
- onboarding
- sentry
- smart-transactions
- srp
- test
- transaction-controller
- transactions
- hooks
- docs
- perps
- hyperliquid
- readme
- e2e
- api-mocking
- helpers
- mock-responses
- defaults
- polymarket
- market-feed-responses
- controller-mocking
- mock-config
- mock-responses/perps
- docs
- framework
- fixtures
- module-mocking/sentry
- pages
- Browser/Confirmations
- Onboarding
- Perps
- Predict
- Rewards
- Settings
- DeveloperOptions
- Transactions
- importSrp
- wallet
- scripts
- seeder
- selectors
- MultiSRP
- Perps
- Predict
- Settings
- Transactions
- wallet
- specs
- accounts
- assets
- confirmations-redesigned
- signatures
- transactions
- token-approve
- confirmations
- regression
- signatures
- identity/account-syncing
- multichain
- multisrp
- perps
- helpers
- predict
- helpers
- quarantine
- rewards
- send
- settings
- snaps
- stake
- wallet
- ios
- Light-Swift-Untar-V2
- MetaMask.xcodeproj
- locales/languages
- patches
- ppom
- src
- scripts
- wdio/screen-objects
- Modals
- Onboarding
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
1,959 files changed
+51903
-162716
lines changedThis file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
185 | 185 | | |
186 | 186 | | |
187 | 187 | | |
188 | | - | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | 188 | | |
275 | 189 | | |
276 | 190 | | |
| |||
301 | 215 | | |
302 | 216 | | |
303 | 217 | | |
304 | | - | |
305 | 218 | | |
306 | 219 | | |
307 | 220 | | |
| |||
313 | 226 | | |
314 | 227 | | |
315 | 228 | | |
316 | | - | |
317 | 229 | | |
318 | 230 | | |
319 | 231 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
27 | 25 | | |
28 | 26 | | |
29 | 27 | | |
| |||
70 | 68 | | |
71 | 69 | | |
72 | 70 | | |
73 | | - | |
74 | 71 | | |
75 | 72 | | |
76 | 73 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
| 68 | + | |
| 69 | + | |
74 | 70 | | |
75 | 71 | | |
76 | 72 | | |
| |||
114 | 110 | | |
115 | 111 | | |
116 | 112 | | |
117 | | - | |
118 | | - | |
| 113 | + | |
| 114 | + | |
119 | 115 | | |
120 | 116 | | |
121 | 117 | | |
122 | 118 | | |
123 | | - | |
124 | | - | |
| 119 | + | |
| 120 | + | |
125 | 121 | | |
126 | 122 | | |
127 | 123 | | |
128 | 124 | | |
129 | | - | |
130 | | - | |
| 125 | + | |
| 126 | + | |
131 | 127 | | |
132 | 128 | | |
133 | 129 | | |
134 | 130 | | |
135 | 131 | | |
136 | | - | |
| 132 | + | |
137 | 133 | | |
138 | | - | |
| 134 | + | |
139 | 135 | | |
140 | | - | |
141 | | - | |
142 | | - | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
143 | 139 | | |
144 | | - | |
| 140 | + | |
145 | 141 | | |
146 | | - | |
147 | | - | |
148 | | - | |
| 142 | + | |
| 143 | + | |
149 | 144 | | |
150 | 145 | | |
151 | 146 | | |
152 | | - | |
153 | | - | |
154 | | - | |
| 147 | + | |
| 148 | + | |
155 | 149 | | |
156 | 150 | | |
157 | 151 | | |
0 commit comments