Skip to content

Commit 123c4ad

Browse files
author
maskara
committed
Minor changes to make things work
1 parent 280d00e commit 123c4ad

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
1313
import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
1414
import fr.free.nrw.commons.settings.SettingsFragment;
15-
import fr.free.nrw.commons.nearby.DirectUpload;
1615
import fr.free.nrw.commons.nearby.PlaceRenderer;
1716

1817
@Singleton
@@ -40,7 +39,6 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
4039

4140
@Override
4241
void inject(ApplicationlessInjection instance);
43-
void inject(DirectUpload directUpload);
4442
void inject(PlaceRenderer placeRenderer);
4543

4644
@Component.Builder

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public class CommonsApplicationModule {
3333
public static final String CATEGORY_AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
3434
public static final long OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024;
3535

36-
private CommonsApplication application;
3736
private Context applicationContext;
3837

3938
public CommonsApplicationModule(Context applicationContext) {
@@ -88,13 +87,13 @@ public SharedPreferences providesOtherSharedPreferences(Context context) {
8887

8988
@Provides
9089
@Named("direct_nearby_upload_prefs")
91-
public SharedPreferences providesDirectNearbyUploadPreferences() {
92-
return application.getSharedPreferences("direct_nearby_upload_prefs", MODE_PRIVATE);
90+
public SharedPreferences providesDirectNearbyUploadPreferences(Context context) {
91+
return context.getSharedPreferences("direct_nearby_upload_prefs", MODE_PRIVATE);
9392
}
9493

9594
@Provides
96-
public UploadController providesUploadController(SessionManager sessionManager, @Named("default_preferences") SharedPreferences sharedPreferences) {
97-
return new UploadController(sessionManager, application, sharedPreferences);
95+
public UploadController providesUploadController(SessionManager sessionManager, @Named("default_preferences") SharedPreferences sharedPreferences, Context context) {
96+
return new UploadController(sessionManager, context, sharedPreferences);
9897
}
9998

10099
@Provides

app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private void openLayout(LinearLayout buttonLayout){
133133

134134
@Override
135135
public void render() {
136-
((CommonsApplication) getContext().getApplicationContext()).injector().inject(this);
136+
// ((CommonsApplication) getContext().getApplicationContext()).injector().inject(this);
137137
place = getContent();
138138
tvName.setText(place.name);
139139
String descriptionText = place.getLongDescription();

app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package fr.free.nrw.commons.upload;
22

3+
import android.annotation.SuppressLint;
34
import android.app.Activity;
45
import android.content.Context;
56
import android.content.Intent;

0 commit comments

Comments
 (0)