Update UploadGpxListener

osmandapp · Feb 11, 2025 · 047343c · 047343c
1 parent 20c0edc
commit 047343c
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/plugins/osmedit/dialogs/SendGpxBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/plugins/osmedit/dialogs/SendGpxBottomSheetFragment.java
@@ -51,7 +51,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment implements UploadGpxListener {
+public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
 
 	public static final String TAG = SendGpxBottomSheetFragment.class.getSimpleName();
 
@@ -192,7 +192,8 @@ protected void onRightBottomButtonClick() {
 			Set<String> tags = tagsText != null ? parseTags(tagsText.toString()) : Collections.emptySet();
 
 			OsmandApplication app = getMyApplication();
-			UploadGPXFilesTask task = new UploadGPXFilesTask(app, tags, description, defaultActivity, uploadVisibility, this);
+			UploadGpxListener listener = getUploadListener(activity);
+			UploadGPXFilesTask task = new UploadGPXFilesTask(app, tags, description, defaultActivity, uploadVisibility, listener);
 			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, files);
 		}
 		dismiss();
@@ -206,25 +207,29 @@ private Set<String> parseTags(@NonNull String tags) {
 				.collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
-	@Override
-	public void onGpxUploadStarted() {
-		updateProgressVisibility(true);
-	}
+	@NonNull
+	private UploadGpxListener getUploadListener(@NonNull FragmentActivity activity) {
+		return new UploadGpxListener() {
+			@Override
+			public void onGpxUploadStarted() {
+				updateProgressVisibility(true);
+			}
 
-	public void onGpxUploadFinished(String result) {
-		updateProgressVisibility(false);
+			public void onGpxUploadFinished(String result) {
+				updateProgressVisibility(false);
 
-		Fragment target = getTargetFragment();
-		if (target instanceof UploadGpxListener) {
-			((UploadGpxListener) target).onGpxUploadFinished(result);
-		}
-	}
+				Fragment target = getTargetFragment();
+				if (target instanceof UploadGpxListener) {
+					((UploadGpxListener) target).onGpxUploadFinished(result);
+				}
+			}
 
-	private void updateProgressVisibility(boolean visible) {
-		FragmentActivity activity = getActivity();
-		if (AndroidUtils.isActivityNotDestroyed(activity)) {
-			activity.setProgressBarIndeterminateVisibility(visible);
-		}
+			private void updateProgressVisibility(boolean visible) {
+				if (AndroidUtils.isActivityNotDestroyed(activity)) {
+					activity.setProgressBarIndeterminateVisibility(visible);
+				}
+			}
+		};
 	}
 
 	protected static void showOpenStreetMapScreen(@NonNull FragmentActivity activity) {