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

Remove WpDatabaseScanner

Browse source
This commit is contained in:
Manuel Fuhr 2022-05-04 17:01:37 +02:00
parent b5895e1fd8
commit fc524fb4db
3 changed files with 2 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,11 +45,9 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
private static final int DIALOG_SELECTBASEDIR_ID = 11;
private static final int DIALOG_MAINACTION_ID = 12;
private static final int DIALOG_OLDDATAHINT_ID = 13;
private static final int DIALOG_SHOW_WP_HELP_ID = 14;
private static final int DIALOG_SHOW_WP_SCANRESULT_ID = 15;
private static final int DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID = 16;
private static final int DIALOG_SHOW_API23_HELP_ID = 17;
private final Set<Integer> dialogIds = new HashSet<>();
private BRouterView mBRouterView;
private PowerManager mPowerManager;
private WakeLock mWakeLock;
@ -66,8 +64,6 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
private String[] availableVias;
private Set<String> selectedVias;
private List<OsmNodeNamed> nogoList;
private String maptoolDirCandidate;
private final Set<Integer> dialogIds = new HashSet<>();
private String errorMessage;
private String title;
private int wpCount;
@ -148,27 +144,6 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
}
});
return builder.create();
case DIALOG_SHOW_WP_HELP_ID:
builder
.setTitle("No Waypoint Database found")
.setMessage(
"The simple scan did not find any map-tool directory including a waypoint database. "
+ "Reason could be there is no map-tool installed (osmand, locus or oruxmaps), or at an "
+ "unusual path, or it contains no waypoints yet. That's o.k. if you want to use BRouter "
+ "in server-mode only - in that case you can still use the 'Server-Mode' button to "
+ "configure the profile mapping. But you will not be able to use nogo-points or do "
+ "long distance calculations. If you know the path to your map-tool, you can manually "
+ "configure it in 'storageconfig.txt'. Or I can do an extended scan searching "
+ "your sd-card for a valid waypoint database").setPositiveButton("Scan", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
mBRouterView.startWpDatabaseScan();
}
}).setNegativeButton("Exit", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
finish();
}
});
return builder.create();
case DIALOG_SHOW_API23_HELP_ID:
builder
.setTitle("Android >=6 limitations")
@ -202,20 +177,6 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
}
});
return builder.create();
case DIALOG_SHOW_WP_SCANRESULT_ID:
builder
.setTitle("Waypoint Database ")
.setMessage("Found Waypoint-Database(s) for maptool-dir: " + maptoolDirCandidate
+ " Configure that?").setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
mBRouterView.saveMaptoolDir(maptoolDirCandidate);
}
}).setNegativeButton("No", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
finish();
}
});
return builder.create();
case DIALOG_OLDDATAHINT_ID:
builder
.setTitle("Local setup needs reset")
@ -448,22 +409,13 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
}
public void showWaypointDatabaseHelp() {
if (mBRouterView.canAccessSdCard) {
showNewDialog(DIALOG_SHOW_WP_HELP_ID);
} else {
showNewDialog(DIALOG_SHOW_API23_HELP_ID);
}
showNewDialog(DIALOG_SHOW_API23_HELP_ID);
}
public void showRepeatTimeoutHelp() {
showNewDialog(DIALOG_SHOW_REPEAT_TIMEOUT_HELP_ID);
}
public void showWpDatabaseScanSuccess(String bestGuess) {
maptoolDirCandidate = bestGuess;
showNewDialog(DIALOG_SHOW_WP_SCANRESULT_ID);
}
public void selectNogos(List<OsmNodeNamed> nogoList) {
this.nogoList = nogoList;
showDialog(DIALOG_NOGOSELECT_ID);