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

Configure profile as service when changing profile settings

Browse source 
When trying to change settings for a profile that was not yet
configured as a service in the android app, the app exits instead of
configuring the profile. This behavior is not very intuitive for users.

This change instead adds a dialog to configure the profile as a new
service in case `Profile Settings` is selected and the selected profile
is not yet configured as a service.
This commit is contained in:
Jan Schopohl 2024-08-31 13:44:42 +02:00
parent e63cc9888f
commit e18e2a16f4
13 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
private String title;
private int wpCount;
private boolean startSilent;
private String configuredParams = null;
ActivityResultLauncher<Intent> someActivityResultLauncher;
@ -108,7 +109,12 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
if (data != null && data.hasExtra("PROFILE_HASH")) {
profile_hash = data.getExtras().getString("PROFILE_HASH", "");
}
mBRouterView.configureServiceParams(profile, sparams);
if (mBRouterView.getConfigureServiceParams(profile) == null) {
mBRouterView.startConfigureService(sparams);
} else {
mBRouterView.configureServiceParams(profile, sparams);
}
}
}
@ -203,6 +209,7 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
return builder.create();
*/
case DIALOG_ROUTINGMODES_ID:
String configuredParams = this.configuredParams;
builder.setTitle(message);
builder.setMultiChoiceItems(routingModes, routingModesChecked,
new DialogInterface.OnMultiChoiceClickListener() {
@ -213,7 +220,7 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
});
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
mBRouterView.configureService(routingModes, routingModesChecked);
mBRouterView.configureService(routingModes, routingModesChecked, configuredParams);
}
});
return builder.create();
@ -345,7 +352,7 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
public void onClick(DialogInterface dialog, int item) {
if (slist.size() > 1 && item == 0) {
if (wpCount == 0) {
mBRouterView.startConfigureService();
mBRouterView.startConfigureService(null);
} else if (wpCount == -3) {
showRepeatTimeoutHelp();
} else if (wpCount >= 2) {
@ -456,21 +463,20 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
}
String sparams = mBRouterView.getConfigureServiceParams(selectedProfile);
if (sparams != null) {
if (listParams.size() > 0) {
Intent i = new Intent(BRouterActivity.this, RoutingParameterDialog.class);
i.putExtra("PROFILE", selectedProfile);
i.putExtra("PROFILE_HASH", String.format("B%X", profile.getAbsolutePath().hashCode()));
i.putExtra("PARAMS", (Serializable) listParams);
i.putExtra("PARAMS_VALUES", sparams);
//startActivityForResult(i, 100);
someActivityResultLauncher.launch(i);
} else {
Toast.makeText(this, R.string.msg_no_profile, Toast.LENGTH_LONG).show();
finish();
}
if (sparams == null) {
// profile is not used yet
sparams = "";
}
if (listParams.size() > 0) {
Intent i = new Intent(BRouterActivity.this, RoutingParameterDialog.class);
i.putExtra("PROFILE", selectedProfile);
i.putExtra("PROFILE_HASH", String.format("B%X", profile.getAbsolutePath().hashCode()));
i.putExtra("PARAMS", (Serializable) listParams);
i.putExtra("PARAMS_VALUES", sparams);
//startActivityForResult(i, 100);
someActivityResultLauncher.launch(i);
} else {
Toast.makeText(this, selectedProfile + getString(R.string.msg_no_used_profile), Toast.LENGTH_LONG).show();
Toast.makeText(this, R.string.msg_no_profile, Toast.LENGTH_LONG).show();
finish();
}
}
@ -539,10 +545,11 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
}
}
public void selectRoutingModes(String[] modes, boolean[] modesChecked, String message) {
public void selectRoutingModes(String[] modes, boolean[] modesChecked, String message, String sparams) {
routingModes = modes;
routingModesChecked = modesChecked;
this.message = message;
this.configuredParams = sparams;
showADialog(DIALOG_ROUTINGMODES_ID);
}
@ -666,7 +673,7 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
private void onItemClick(AdapterView<?> adapterView, View view, int which, long l) {
if (which == 0) {
if (wpCount == 0) {
mBRouterView.startConfigureService();
mBRouterView.startConfigureService(null);
} else if (wpCount == -3) {
showRepeatTimeoutHelp();
} else if (wpCount >= 2) {

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

@ -817,17 +817,17 @@ public class BRouterView extends View {
}
}
public void startConfigureService() {
public void startConfigureService(String sparams) {
String[] modes = new String[]
{"foot_short", "foot_fast", "bicycle_short", "bicycle_fast", "motorcar_short", "motorcar_fast"};
boolean[] modesChecked = new boolean[6];
String msg = "Choose service-modes to configure (" + profileName + " [" + nogoVetoList.size() + "])";
((BRouterActivity) getContext()).selectRoutingModes(modes, modesChecked, msg);
((BRouterActivity) getContext()).selectRoutingModes(modes, modesChecked, msg, sparams);
}
public void configureService(String[] routingModes, boolean[] checkedModes) {
public void configureService(String[] routingModes, boolean[] checkedModes, String sparams) {
// read in current config
TreeMap<String, ServiceModeConfig> map = new TreeMap<>();
BufferedReader br = null;
@ -861,7 +861,8 @@ public class BRouterView extends View {
s = sm.params;
p = sm.profile;
}
if (s == null || !p.equals(profileName)) s = "noparams";
if (!p.equals(profileName)) s = sparams;
if (s == null || s.equals("")) s = "noparams";
ServiceModeConfig smc = new ServiceModeConfig(routingModes[i], profileName, s);
for (OsmNodeNamed nogo : nogoVetoList) {
smc.nogoVetos.add(nogo.ilon + "," + nogo.ilat);