Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10771 from osmandapp/master

Browse source 
update test branch
This commit is contained in:
Hardy 2021-02-04 21:37:05 +01:00 committed by GitHub
commit 7b5c8f144f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/main/java/net/osmand/PlatformUtil.java
View file

@ -23,7 +23,9 @@ public class PlatformUtil {
}
public static XmlPullParser newXMLPullParser() throws XmlPullParserException{
return new org.kxml2.io.KXmlParser();
org.kxml2.io.KXmlParser xmlParser = new org.kxml2.io.KXmlParser();
xmlParser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
return xmlParser;
}
public static XmlSerializer newSerializer() {

11
OsmAnd/src/net/osmand/plus/NavigationService.java
View file

@ -4,16 +4,13 @@ import android.app.Notification;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.location.LocationManager;
import android.os.Binder;
import android.os.IBinder;
import android.util.Log;
import android.widget.Toast;
import androidx.annotation.NonNull;
import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.plus.helpers.LocationServiceHelper;
import net.osmand.plus.helpers.LocationServiceHelper.LocationCallback;
import net.osmand.plus.notifications.OsmandNotification;
@ -95,12 +92,6 @@ public class NavigationService extends Service {
@Override
public void onLocationAvailability(boolean locationAvailable) {
if (!locationAvailable) {
OsmandApplication app = (OsmandApplication) getApplication();
if (app != null) {
app.showToastMessage(getString(R.string.off_router_service_no_gps_available));
}
}
}
});
} catch (SecurityException e) {
@ -137,11 +128,13 @@ public class NavigationService extends Service {
app.setNavigationService(null);
usedBy = 0;
// remove updates
if (locationServiceHelper != null) {
try {
locationServiceHelper.removeLocationUpdates();
} catch (SecurityException e) {
// Location service permission not granted
}
}
// remove notification
stopForeground(Boolean.TRUE);
app.getNotificationHelper().updateTopNotification();

58
OsmAnd/src/net/osmand/plus/mapcontextmenu/UploadPhotosAsyncTask.java
View file

@ -4,7 +4,6 @@ import android.content.DialogInterface;
import android.content.DialogInterface.OnDismissListener;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.net.Uri;
import android.os.AsyncTask;
@ -102,10 +101,11 @@ public class UploadPhotosAsyncTask extends AsyncTask<Void, Integer, Void> {
private boolean handleSelectedImage(final Uri uri) {
boolean success = false;
InputStream inputStream = null;
int[] imageDimensions = null;
try {
inputStream = app.getContentResolver().openInputStream(uri);
if (inputStream != null) {
success = uploadImageToPlace(inputStream);
imageDimensions = calcImageDimensions(inputStream);
}
} catch (Exception e) {
LOG.error(e);
@ -113,12 +113,27 @@ public class UploadPhotosAsyncTask extends AsyncTask<Void, Integer, Void> {
} finally {
Algorithms.closeStream(inputStream);
}
if (imageDimensions != null && imageDimensions.length == 2) {
try {
inputStream = app.getContentResolver().openInputStream(uri);
if (inputStream != null) {
int width = imageDimensions[0];
int height = imageDimensions[1];
success = uploadImageToPlace(inputStream, width, height);
}
} catch (Exception e) {
LOG.error(e);
app.showToastMessage(R.string.cannot_upload_image);
} finally {
Algorithms.closeStream(inputStream);
}
}
return success;
}
private boolean uploadImageToPlace(InputStream image) {
private boolean uploadImageToPlace(InputStream image, int width, int height) {
boolean success = false;
InputStream serverData = new ByteArrayInputStream(compressImageToJpeg(image));
InputStream serverData = new ByteArrayInputStream(compressImageToJpeg(image, width, height));
String baseUrl = OPRConstants.getBaseUrl(app);
// all these should be constant
String url = baseUrl + "api/ipfs/image";
@ -178,28 +193,35 @@ public class UploadPhotosAsyncTask extends AsyncTask<Void, Integer, Void> {
}
}
private byte[] compressImageToJpeg(InputStream image) {
private int[] calcImageDimensions(InputStream image) {
BufferedInputStream bufferedInputStream = new BufferedInputStream(image);
BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inSampleSize = 4;
Bitmap bmp = BitmapFactory.decodeStream(bufferedInputStream, null, opts);
ByteArrayOutputStream os = new ByteArrayOutputStream();
int h = bmp.getHeight();
int w = bmp.getWidth();
opts.inJustDecodeBounds = true;
BitmapFactory.decodeStream(bufferedInputStream, null, opts);
return new int[] { opts.outWidth, opts.outHeight };
}
private byte[] compressImageToJpeg(InputStream image, int width, int height) {
BufferedInputStream bufferedInputStream = new BufferedInputStream(image);
int w = width;
int h = height;
boolean scale = false;
int divider = 1;
while (w > MAX_IMAGE_LENGTH || h > MAX_IMAGE_LENGTH) {
w = w / 2;
h = h / 2;
w /= 2;
h /= 2;
divider *= 2;
scale = true;
}
Bitmap bmp;
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;
BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inSampleSize = divider;
bmp = BitmapFactory.decodeStream(bufferedInputStream, null, opts);
} else {
bmp = BitmapFactory.decodeStream(bufferedInputStream);
}
ByteArrayOutputStream os = new ByteArrayOutputStream();
bmp.compress(Bitmap.CompressFormat.JPEG, 90, os);
return os.toByteArray();
}

5
OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java
View file

@ -90,11 +90,14 @@ public class JSMediaCommandPlayerImpl extends MediaCommandPlayerImpl {
if (voiceDir.getName().contains("tts")) {
return false;
}
for (File f : voiceDir.listFiles()) {
File[] files = voiceDir.listFiles();
if (files != null) {
for (File f : files) {
if (f.getName().endsWith(IndexConstants.TTSVOICE_INDEX_EXT_JS)) {
return true;
}
}
}
return false;
}