From 3f69fcbe07b2c0f0aeb4135015a8c777e7449727 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 25 Jan 2021 19:22:50 +0100
Subject: [PATCH] Fix extension for uploading images

---
 .../java/net/osmand/osm/io/NetworkUtils.java  |  4 +--
 .../plus/mapcontextmenu/MenuBuilder.java      | 25 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/io/NetworkUtils.java b/OsmAnd-java/src/main/java/net/osmand/osm/io/NetworkUtils.java
index 5119f9eede..9e4d858436 100644
--- a/OsmAnd-java/src/main/java/net/osmand/osm/io/NetworkUtils.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/io/NetworkUtils.java
@@ -57,7 +57,7 @@ public class NetworkUtils {
 		}
 	}
 
-	public static String sendPostDataRequest(String urlText, InputStream data) {
+	public static String sendPostDataRequest(String urlText, String formName, String fileName, InputStream data) {
 		try {
 			log.info("POST : " + urlText);
 			HttpURLConnection conn = getHttpURLConnection(urlText);
@@ -69,7 +69,7 @@ public class NetworkUtils {
 			conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY);
 			OutputStream ous = conn.getOutputStream();
 			ous.write(("--" + BOUNDARY + "\r\n").getBytes());
-			ous.write(("Content-Disposition: form-data; name=\"" + "file" + "\"; filename=\"" + "image1" + "\"\r\n").getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
+			ous.write(("Content-Disposition: form-data; name=\"" + formName + "\"; filename=\"" + fileName + "\"\r\n").getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
 			ous.write(("Content-Type: application/octet-stream\r\n\r\n").getBytes()); //$NON-NLS-1$
 			Algorithms.streamCopy(data, ous);
 			ous.write(("\r\n--" + BOUNDARY + "--\r\n").getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
index aa41508f7d..3890046fac 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
@@ -9,6 +9,7 @@ import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
@@ -98,6 +99,7 @@ import static net.osmand.plus.mapcontextmenu.builders.cards.ImageCard.GetImageCa
 public class MenuBuilder {
 
 	private static final int PICK_IMAGE = 1231;
+	private static final int MAX_IMAGE_LENGTH = 2048;
 	private static final Log LOG = PlatformUtil.getLog(MenuBuilder.class);
 	public static final float SHADOW_HEIGHT_TOP_DP = 17f;
 	public static final int TITLE_LIMIT = 60;
@@ -505,10 +507,11 @@ public class MenuBuilder {
 	}
 
 	private void uploadImageToPlace(InputStream image) {
-		InputStream serverData = new ByteArrayInputStream(compressImage(image));
+		InputStream serverData = new ByteArrayInputStream(compressImageToJpeg(image));
 		final String baseUrl = OPRConstants.getBaseUrl(app);
+		// all these should be constant
 		String url = baseUrl + "api/ipfs/image";
-		String response = NetworkUtils.sendPostDataRequest(url, serverData);
+		String response = NetworkUtils.sendPostDataRequest(url, "file", "compressed.jpeg", serverData);
 		if (response != null) {
 			int res = 0;
 			try {
@@ -571,10 +574,26 @@ public class MenuBuilder {
 		}
 	}
 
-	private byte[] compressImage(InputStream image) {
+	private byte[] compressImageToJpeg(InputStream image) {
 		BufferedInputStream bufferedInputStream = new BufferedInputStream(image);
 		Bitmap bmp = BitmapFactory.decodeStream(bufferedInputStream);
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
+		int h = bmp.getHeight();
+		int w = bmp.getWidth();
+		boolean scale = false;
+		while (w > MAX_IMAGE_LENGTH || h > MAX_IMAGE_LENGTH) {
+			w = w / 2;
+			h = h / 2;
+			scale = true;
+		}
+		if (scale) {
+			Matrix matrix = new Matrix();
+			matrix.postScale(w, h);
+			Bitmap resizedBitmap = Bitmap.createBitmap(
+					bmp, 0, 0, w, h, matrix, false);
+			bmp.recycle();
+			bmp = resizedBitmap;
+		}
 		bmp.compress(Bitmap.CompressFormat.JPEG, 90, os);
 		return os.toByteArray();
 	}