Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Silent code cleanup

Browse source
This commit is contained in:
Manuel Fuhr 2022-04-24 14:25:12 +02:00
parent 11f104afe9
commit 1d2809de70
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java
View file

@ -65,7 +65,7 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
private Set<String> selectedVias; private Set<String> selectedVias;
private List<OsmNodeNamed> nogoList; private List<OsmNodeNamed> nogoList;
private String maptoolDirCandidate; private String maptoolDirCandidate;
private Set<Integer> dialogIds = new HashSet<Integer>(); private final Set<Integer> dialogIds = new HashSet<Integer>();
private String errorMessage; private String errorMessage;
private String title; private String title;
private int wpCount; private int wpCount;

11
brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
View file

@ -80,7 +80,7 @@ public class BRouterView extends View {
private long lastDataTime = System.currentTimeMillis(); private long lastDataTime = System.currentTimeMillis();
private CoordinateReader cor; private CoordinateReader cor;
private int[] imgPixels; private int[] imgPixels;
private int memoryClass; private final int memoryClass;
private long lastTs = System.currentTimeMillis(); private long lastTs = System.currentTimeMillis();
private long startTime = 0L; private long startTime = 0L;
@ -203,10 +203,7 @@ public class BRouterView extends View {
int deviceLevel = Build.VERSION.SDK_INT; int deviceLevel = Build.VERSION.SDK_INT;
int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion; int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion;
canAccessSdCard = true; canAccessSdCard = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || Environment.isExternalStorageLegacy();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && !Environment.isExternalStorageLegacy()) {
canAccessSdCard = false;
}
if (ContextCompat.checkSelfPermission(getContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { if (ContextCompat.checkSelfPermission(getContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
canAccessSdCard = false; canAccessSdCard = false;
} }
@ -393,7 +390,7 @@ public class BRouterView extends View {
try { try {
cor.readAllPoints(); cor.readAllPoints();
} catch (Exception e) { } catch (Exception e) {
msg = "Error reading waypoints: " + e.toString(); msg = "Error reading waypoints: " + e;
} }
int size = cor.allpoints.size(); int size = cor.allpoints.size();
@ -962,7 +959,7 @@ public class BRouterView extends View {
for (ServiceModeConfig smc : map.values()) { for (ServiceModeConfig smc : map.values()) {
bw.write(smc.toLine()); bw.write(smc.toLine());
bw.write('\n'); bw.write('\n');
msg.append(smc.toString()).append('\n'); msg.append(smc).append('\n');
} }
} catch (Exception e) { } catch (Exception e) {
} finally { } finally {