Skip to content

Commit 4e4d5be

Browse files
parneet-gurayaparneet-guraya
committed
cleanup
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
1 parent 6b1b361 commit 4e4d5be

File tree

14 files changed

+49
-83
lines changed

14 files changed

+49
-83
lines changed

‎app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,16 @@ public class BookmarkLocationsFragment extends DaggerFragment {
3535
@Inject CommonPlaceClickActions commonPlaceClickActions;
3636
private PlaceAdapter adapter;
3737

38-
private ActivityResultLauncher<Intent> cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
38+
private final ActivityResultLauncher<Intent> cameraPickLauncherForResult =
39+
registerForActivityResult(new StartActivityForResult(),
3940
result -> {
4041
contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> {
4142
contributionController.onPictureReturnedFromCamera(result,requireActivity(),callbacks);
4243
});
4344
});
4445

45-
private ActivityResultLauncher<Intent> galleryPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
46+
private final ActivityResultLauncher<Intent> galleryPickLauncherForResult =
47+
registerForActivityResult(new StartActivityForResult(),
4648
result -> {
4749
contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> {
4850
contributionController.onPictureReturnedFromGallery(result,requireActivity(),callbacks);

‎app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

+18-17
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ private boolean isDocumentPhotoPickerPreferred(){
266266
}
267267

268268
public void onPictureReturnedFromGallery(ActivityResult result, Activity activity, FilePicker.Callbacks callbacks){
269+
269270
if(isDocumentPhotoPickerPreferred()){
270271
FilePicker.onPictureReturnedFromDocuments(result, activity, callbacks);
271272
} else {
@@ -288,25 +289,25 @@ public void handleActivityResultWithCallback(Activity activity, FilePicker.Handl
288289

289290
handleActivityResult.onHandleActivityResult(new DefaultCallback() {
290291

291-
@Override
292-
public void onCanceled(final ImageSource source, final int type) {
293-
super.onCanceled(source, type);
294-
defaultKvStore.remove(PLACE_OBJECT);
295-
}
292+
@Override
293+
public void onCanceled(final ImageSource source, final int type) {
294+
super.onCanceled(source, type);
295+
defaultKvStore.remove(PLACE_OBJECT);
296+
}
296297

297-
@Override
298-
public void onImagePickerError(Exception e, FilePicker.ImageSource source,
299-
int type) {
300-
ViewUtil.showShortToast(activity, R.string.error_occurred_in_picking_images);
301-
}
298+
@Override
299+
public void onImagePickerError(Exception e, FilePicker.ImageSource source,
300+
int type) {
301+
ViewUtil.showShortToast(activity, R.string.error_occurred_in_picking_images);
302+
}
302303

303-
@Override
304-
public void onImagesPicked(@NonNull List<UploadableFile> imagesFiles,
305-
FilePicker.ImageSource source, int type) {
306-
Intent intent = handleImagesPicked(activity, imagesFiles);
307-
activity.startActivity(intent);
308-
}
309-
});
304+
@Override
305+
public void onImagesPicked(@NonNull List<UploadableFile> imagesFiles,
306+
FilePicker.ImageSource source, int type) {
307+
Intent intent = handleImagesPicked(activity, imagesFiles);
308+
activity.startActivity(intent);
309+
}
310+
});
310311
}
311312

312313
public List<UploadableFile> handleExternalImagesPicked(Activity activity,

‎app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,24 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
9898
private int contributionsSize;
9999
private String userName;
100100

101-
private ActivityResultLauncher<Intent> galleryPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
101+
private final ActivityResultLauncher<Intent> galleryPickLauncherForResult =
102+
registerForActivityResult(new StartActivityForResult(),
102103
result -> {
103104
controller.handleActivityResultWithCallback(requireActivity(),callbacks -> {
104105
controller.onPictureReturnedFromGallery(result,requireActivity(),callbacks);
105106
});
106107
});
107108

108-
private ActivityResultLauncher<Intent> customSelectorLauncherForResult = registerForActivityResult(new StartActivityForResult(),
109+
private final ActivityResultLauncher<Intent> customSelectorLauncherForResult =
110+
registerForActivityResult(new StartActivityForResult(),
109111
result -> {
110112
controller.handleActivityResultWithCallback(requireActivity(),callbacks -> {
111113
controller.onPictureReturnedFromCustomSelector(result,requireActivity(),callbacks);
112114
});
113115
});
114116

115-
private ActivityResultLauncher<Intent> cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
117+
private final ActivityResultLauncher<Intent> cameraPickLauncherForResult =
118+
registerForActivityResult(new StartActivityForResult(),
116119
result -> {
117120
controller.handleActivityResultWithCallback(requireActivity(),callbacks -> {
118121
controller.onPictureReturnedFromCamera(result,requireActivity(),callbacks);

‎app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java

+7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package fr.free.nrw.commons.contributions;
22

3+
import android.Manifest.permission;
34
import android.annotation.SuppressLint;
45
import android.app.Activity;
56
import android.content.Context;
67
import android.content.Intent;
78
import android.content.SharedPreferences;
9+
import android.os.Build.VERSION;
10+
import android.os.Build.VERSION_CODES;
811
import android.os.Bundle;
912
import android.view.Menu;
1013
import android.view.MenuItem;
@@ -13,8 +16,10 @@
1316
import androidx.annotation.Nullable;
1417
import androidx.fragment.app.Fragment;
1518
import androidx.fragment.app.FragmentManager;
19+
import androidx.viewpager.widget.ViewPager;
1620
import androidx.work.ExistingWorkPolicy;
1721
import fr.free.nrw.commons.databinding.MainBinding;
22+
import fr.free.nrw.commons.CommonsApplication;
1823
import fr.free.nrw.commons.R;
1924
import fr.free.nrw.commons.WelcomeActivity;
2025
import fr.free.nrw.commons.auth.SessionManager;
@@ -36,8 +41,10 @@
3641
import fr.free.nrw.commons.quiz.QuizChecker;
3742
import fr.free.nrw.commons.settings.SettingsFragment;
3843
import fr.free.nrw.commons.theme.BaseActivity;
44+
import fr.free.nrw.commons.upload.UploadActivity;
3945
import fr.free.nrw.commons.upload.UploadProgressActivity;
4046
import fr.free.nrw.commons.upload.worker.WorkRequestHelper;
47+
import fr.free.nrw.commons.utils.PermissionUtils;
4148
import fr.free.nrw.commons.utils.ViewUtilWrapper;
4249
import io.reactivex.Completable;
4350
import io.reactivex.schedulers.Schedulers;

‎app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class CustomSelectorActivity :
230230
/**
231231
* When data will be send from full screen mode, it will be passed to fragment
232232
*/
233-
fun onFullScreenDataReceived(result: ActivityResult){
233+
private fun onFullScreenDataReceived(result: ActivityResult){
234234
if (result.resultCode == Activity.RESULT_OK) {
235235
val selectedImages: ArrayList<Image> =
236236
result.data!!

‎app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt

+1-19
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@ class DescriptionEditActivity :
7272

7373
private lateinit var binding: ActivityDescriptionEditBinding
7474

75-
private val requestCodeForVoiceInput = 1213
76-
7775
private var descriptionAndCaptions: ArrayList<UploadMediaDetail>? = null
7876

79-
private val voiceInputResultLauncher = registerForActivityResult<Intent, ActivityResult>(
77+
private val voiceInputResultLauncher = registerForActivityResult(
8078
ActivityResultContracts.StartActivityForResult()
8179
) { result: ActivityResult ->
8280
onVoiceInput(result)
@@ -310,22 +308,6 @@ class DescriptionEditActivity :
310308
progressDialog!!.show()
311309
}
312310

313-
// override fun onActivityResult(
314-
// requestCode: Int,
315-
// resultCode: Int,
316-
// data: Intent?,
317-
// ) {
318-
// super.onActivityResult(requestCode, resultCode, data)
319-
// if (requestCode == requestCodeForVoiceInput) {
320-
// if (resultCode == RESULT_OK && data != null) {
321-
// val result = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
322-
// uploadMediaDetailAdapter.handleSpeechResult(result!![0])
323-
// } else {
324-
// Timber.e("Error %s", resultCode)
325-
// }
326-
// }
327-
// }
328-
329311
override fun onSaveInstanceState(outState: Bundle) {
330312
super.onSaveInstanceState(outState)
331313

‎app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ public interface Constants {
99
interface RequestCodes {
1010
int LOCATION = 1;
1111
int STORAGE = 2;
12-
13-
int RECEIVE_DATA_FROM_FULL_SCREEN_MODE = 1 << 9;
1412
}
1513

1614
/**

‎app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package fr.free.nrw.commons.media;
22

3-
import static android.app.Activity.RESULT_CANCELED;
4-
import static android.app.Activity.RESULT_OK;
53
import static android.view.View.GONE;
64
import static android.view.View.VISIBLE;
75
import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_NEEDING_CATEGORIES;
86
import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_UNCATEGORISED;
97
import static fr.free.nrw.commons.description.EditDescriptionConstants.LIST_OF_DESCRIPTION_AND_CAPTION;
10-
import static fr.free.nrw.commons.description.EditDescriptionConstants.UPDATED_WIKITEXT;
118
import static fr.free.nrw.commons.description.EditDescriptionConstants.WIKITEXT;
129
import static fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_LOCATION;
1310
import static fr.free.nrw.commons.utils.LangCodeUtils.getLocalizedResources;
@@ -112,7 +109,6 @@
112109
public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
113110
CategoryEditHelper.Callback {
114111

115-
private static final int REQUEST_CODE = 1001;
116112
private static final String IMAGE_BACKGROUND_COLOR = "image_background_color";
117113
static final int DEFAULT_IMAGE_BACKGROUND_COLOR = 0;
118114

‎app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -223,21 +223,24 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
223223
private List<BottomSheetItem> dataList;
224224
private BottomSheetAdapter bottomSheetAdapter;
225225

226-
private ActivityResultLauncher<Intent> galleryPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
226+
private final ActivityResultLauncher<Intent> galleryPickLauncherForResult =
227+
registerForActivityResult(new StartActivityForResult(),
227228
result -> {
228229
controller.handleActivityResultWithCallback(requireActivity(),callbacks -> {
229230
controller.onPictureReturnedFromGallery(result,requireActivity(),callbacks);
230231
});
231232
});
232233

233-
private ActivityResultLauncher<Intent> customSelectorLauncherForResult = registerForActivityResult(new StartActivityForResult(),
234+
private final ActivityResultLauncher<Intent> customSelectorLauncherForResult =
235+
registerForActivityResult(new StartActivityForResult(),
234236
result -> {
235237
controller.handleActivityResultWithCallback(requireActivity(),callbacks -> {
236238
controller.onPictureReturnedFromCustomSelector(result,requireActivity(),callbacks);
237239
});
238240
});
239241

240-
private ActivityResultLauncher<Intent> cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
242+
private final ActivityResultLauncher<Intent> cameraPickLauncherForResult =
243+
registerForActivityResult(new StartActivityForResult(),
241244
result -> {
242245
controller.handleActivityResultWithCallback(requireActivity(),callbacks -> {
243246
controller.onPictureReturnedFromCamera(result,requireActivity(),callbacks);

‎app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public class SettingsFragment extends PreferenceFragmentCompat {
8787
private ListView languageHistoryListView;
8888
private static final String GET_CONTENT_PICKER_HELP_URL = "https://commons-app.github.io/docs.html#get-content";
8989

90-
private ActivityResultLauncher<Intent> cameraPickLauncherForResult = registerForActivityResult(new StartActivityForResult(),
90+
private final ActivityResultLauncher<Intent> cameraPickLauncherForResult =
91+
registerForActivityResult(new StartActivityForResult(),
9192
result -> {
9293
contributionController.handleActivityResultWithCallback(requireActivity(),callbacks -> {
9394
contributionController.onPictureReturnedFromCamera(result,requireActivity(),callbacks);

‎app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ public class UploadMediaDetailAdapter extends
5858
private int currentPosition;
5959
private Fragment fragment;
6060
private Activity activity;
61-
private ActivityResultLauncher<Intent> voiceInputResultLauncher;
61+
private final ActivityResultLauncher<Intent> voiceInputResultLauncher;
6262
private SelectedVoiceIcon selectedVoiceIcon;
63-
private static final int REQUEST_CODE_FOR_VOICE_INPUT = 1213;
6463

6564
private RowItemDescriptionBinding binding;
6665

‎app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

-26
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
6363

6464
private UploadMediaDetailAdapter uploadMediaDetailAdapter;
6565

66-
// private static final int REQUEST_CODE_FOR_EDIT_ACTIVITY = 1212;
67-
// private static final int REQUEST_CODE_FOR_VOICE_INPUT = 1213;
68-
6966
private final ActivityResultLauncher<Intent> startForResult = registerForActivityResult(
7067
new StartActivityForResult(), result -> {
7168
onCameraPosition(result);
@@ -706,7 +703,6 @@ private void onVoiceInput(ActivityResult result) {
706703
}
707704

708705
private void onEditActivityResult(ActivityResult result){
709-
//TODO[Parry] Doubtful how it works, understand it....
710706
if (result.getResultCode() == RESULT_OK) {
711707
String path = result.getData().getStringExtra("editedImageFilePath");
712708

@@ -727,28 +723,6 @@ private void onEditActivityResult(ActivityResult result){
727723
}
728724
}
729725

730-
/**
731-
* Get the coordinates and update the existing coordinates.
732-
* @param requestCode code of request
733-
* @param resultCode code of result
734-
* @param data intent
735-
*/
736-
// @Override
737-
// public void onActivityResult(final int requestCode, final int resultCode,
738-
// @Nullable final Intent data) {
739-
// super.onActivityResult(requestCode, resultCode, data);
740-
//
741-
// if (requestCode == REQUEST_CODE_FOR_VOICE_INPUT) {
742-
// if (resultCode == RESULT_OK && data != null) {
743-
// ArrayList<String> result = data.getStringArrayListExtra(
744-
// RecognizerIntent.EXTRA_RESULTS);
745-
// uploadMediaDetailAdapter.handleSpeechResult(result.get(0));
746-
// }else {
747-
// Timber.e("Error %s", resultCode);
748-
// }
749-
// }
750-
// }
751-
752726
/**
753727
* Removes the location data from the image, by setting them to null
754728
*/

‎app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class CustomSelectorActivityTest {
100100
}
101101

102102
/**
103-
* Test onActivityResult function.
103+
* Test callback when result received.
104104
*/
105105
@Test
106106
@Throws(Exception::class)

‎app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ class UploadMediaDetailFragmentUnitTest {
349349

350350
@Test
351351
@Throws(Exception::class)
352-
fun testOnActivityResultOnMapIconClicked() {
352+
fun testOnCameraPositionCallbackOnMapIconClicked() {
353353
shadowOf(Looper.getMainLooper()).idle()
354354
Mockito.mock(LocationPicker::class.java)
355355
val intent = Mockito.mock(Intent::class.java)
@@ -375,7 +375,7 @@ class UploadMediaDetailFragmentUnitTest {
375375

376376
@Test
377377
@Throws(Exception::class)
378-
fun testOnActivityResultAddLocationDialog() {
378+
fun testOnCameraPositionCallbackAddLocationDialog() {
379379
shadowOf(Looper.getMainLooper()).idle()
380380
Mockito.mock(LocationPicker::class.java)
381381
val intent = Mockito.mock(Intent::class.java)

0 commit comments

Comments
 (0)