Skip to content

Commit b30f5c8

Browse files
authored
Merge pull request #114 from ismoy/main
Unified main and develop
2 parents beb3d76 + 4e06a35 commit b30f5c8

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

docs/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7272
- **API Compatibility**: Useful for any service that requires precise byte values
7373
- **Migration Guide**: To get KB from bytes, divide by 1024: `val fileSizeKB = (result.fileSize ?: 0) / 1024.0`
7474
- **Updated Documentation**: All examples and documentation updated to reflect byte-based sizes
75+
- ### Fixed
76+
- Resolved manifest merge conflict with host apps using FileProvider
7577

7678
### Added
7779

@@ -556,4 +558,4 @@ For feature requests, please:
556558

557559
---
558560

559-
**Note**: This changelog is maintained by the ImagePickerKMP team. For questions or suggestions, please contact us.
561+
**Note**: This changelog is maintained by the ImagePickerKMP team. For questions or suggestions, please contact us.

library/src/androidMain/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<application>
1818
<provider
19-
android:name="androidx.core.content.FileProvider"
19+
android:name=".data.managers.ImagePickerFileProvider"
2020
android:authorities="${applicationId}.fileprovider"
2121
android:exported="false"
2222
android:grantUriPermissions="true">
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package io.github.ismoy.imagepickerkmp.data.managers
2+
3+
import androidx.core.content.FileProvider
4+
5+
internal class ImagePickerFileProvider: FileProvider()

0 commit comments

Comments
 (0)