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

Fix conflicts

Browse source
This commit is contained in:
neslihanturan 2018-03-06 20:32:28 +03:00
parent 5b88111289
commit 41494bea5b
5 changed files with 6 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
View file

@ -80,20 +80,13 @@ public class ContributionController {
//FIXME: Starts gallery (opens Google Photos)
Intent pickImageIntent = new Intent(ACTION_GET_CONTENT);
pickImageIntent.setType("image/*");
<<<<<<< HEAD
Timber.d("startGalleryPick() called with pickImageIntent");
// See https://stackoverflow.com/questions/22366596/android-illegalstateexception-fragment-not-attached-to-activity-webview
if (!fragment.isAdded()) {
return;
}
=======
// See https://stackoverflow.com/questions/22366596/android-illegalstateexception-fragment-not-attached-to-activity-webview
if (!fragment.isAdded()) {
Timber.d("Fragment is not added, startActivityForResult cannot be called");
return;
}
Timber.d("startGalleryPick() called with pickImageIntent");
>>>>>>> directNearbyUploadsNewLocal
fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
}
@ -123,11 +116,9 @@ public class ContributionController {
if (isDirectUpload) {
shareIntent.putExtra("isDirectUpload", true);
}
<<<<<<< HEAD
=======
break;
default:
>>>>>>> directNearbyUploadsNewLocal
break;
}
Timber.i("Image selected");