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

Merge branch 'r3.9'

Browse source
This commit is contained in:
max-klaus 2021-02-04 16:45:00 +03:00
commit 5eb5d1080b
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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