mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed conflicts

Browse source
This commit is contained in:
Kanahia 2024-07-10 12:21:03 +05:30
parent 45681f7a41
commit 81de2ed626
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View file

@ -47,6 +47,9 @@
android:theme="@style/LightAppTheme" android:theme="@style/LightAppTheme"
tools:ignore="GoogleAppIndexingWarning" tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:appComponentFactory"> tools:replace="android:appComponentFactory">
<activity
android:name=".nearby.WikidataFeedback"
android:exported="false" />
<activity <activity
android:name=".upload.UploadProgressActivity" android:name=".upload.UploadProgressActivity"
android:exported="false" /> android:exported="false" />

2
app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
View file

@ -84,5 +84,7 @@ public abstract class ActivityBuilderModule {
@ContributesAndroidInjector @ContributesAndroidInjector
abstract UploadProgressActivity bindUploadProgressActivity(); abstract UploadProgressActivity bindUploadProgressActivity();
@ContributesAndroidInjector
abstract WikidataFeedback bindWikiFeedback(); abstract WikidataFeedback bindWikiFeedback();
} }