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

#9621 Add validation for the online tracking link

Browse source
This commit is contained in:
Alexander Sytnyk 2020-10-07 14:23:34 +03:00
parent cdc903e3db
commit b201f147ac
3 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
View file

@ -942,4 +942,20 @@ public class Algorithms {
} }
return res; return res;
} }
public static boolean isValidMessageFormat(CharSequence sequence) {
if (!isEmpty(sequence)) {
int counter = 0;
for (int i = 0; i < sequence.length(); i++) {
char ch = sequence.charAt(i);
if (ch == '{') {
counter++;
} else if (ch == '}') {
counter--;
}
}
return counter == 0;
}
return false;
}
} }

16
OsmAnd/src/net/osmand/plus/monitoring/LiveMonitoringHelper.java
View file

@ -131,7 +131,14 @@ public class LiveMonitoringHelper {
} }
public void sendData(LiveMonitoringData data) { public void sendData(LiveMonitoringData data) {
String urlStr = getLiveUrl(data); String baseUrl = app.getSettings().LIVE_MONITORING_URL.get();
String urlStr;
try {
urlStr = getLiveUrl(baseUrl, data);
} catch (IllegalArgumentException e) {
log.error("Could not construct live url from base url: " + baseUrl, e);
return;
}
try { try {
// Parse the URL and let the URI constructor handle proper encoding of special characters such as spaces // Parse the URL and let the URI constructor handle proper encoding of special characters such as spaces
URL url = new URL(urlStr); URL url = new URL(urlStr);
@ -172,12 +179,11 @@ public class LiveMonitoringHelper {
} }
} }
private String getLiveUrl(LiveMonitoringData data) { private String getLiveUrl(String baseUrl, LiveMonitoringData data) {
String st = app.getSettings().LIVE_MONITORING_URL.get();
List<String> prm = new ArrayList<String>(); List<String> prm = new ArrayList<String>();
int maxLen = 0; int maxLen = 0;
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
boolean b = st.contains("{"+i+"}"); boolean b = baseUrl.contains("{"+i+"}");
if(b) { if(b) {
maxLen = i; maxLen = i;
} }
@ -210,6 +216,6 @@ public class LiveMonitoringHelper {
break; break;
} }
} }
return MessageFormat.format(st, prm.toArray()); return MessageFormat.format(baseUrl, prm.toArray());
} }
} }

21
OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
View file

@ -8,6 +8,7 @@ import android.graphics.Typeface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
@ -23,11 +24,11 @@ import android.view.Window;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable; import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -35,6 +36,8 @@ import net.osmand.plus.R;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.SavingTrackHelper; import net.osmand.plus.activities.SavingTrackHelper;
import net.osmand.plus.activities.SettingsBaseActivity; import net.osmand.plus.activities.SettingsBaseActivity;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.util.Algorithms;
import java.util.Map; import java.util.Map;
@ -172,8 +175,20 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
cat.setTitle(R.string.live_monitoring_m); cat.setTitle(R.string.live_monitoring_m);
grp.addPreference(cat); grp.addPreference(cat);
cat.addPreference(createEditTextPreference(settings.LIVE_MONITORING_URL, R.string.live_monitoring_url, EditTextPreference urlPreference = createEditTextPreference(settings.LIVE_MONITORING_URL, R.string.live_monitoring_url,
R.string.live_monitoring_url_descr)); R.string.live_monitoring_url_descr);
urlPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (Algorithms.isValidMessageFormat((String) newValue)) {
return SettingsMonitoringActivity.super.onPreferenceChange(preference, newValue);
} else {
Toast.makeText(SettingsMonitoringActivity.this, R.string.wrong_format, Toast.LENGTH_SHORT).show();
return false;
}
}
});
cat.addPreference(urlPreference);
final CheckBoxPreference liveMonitoring = createCheckBoxPreference(settings.LIVE_MONITORING, R.string.live_monitoring_m, final CheckBoxPreference liveMonitoring = createCheckBoxPreference(settings.LIVE_MONITORING, R.string.live_monitoring_m,
R.string.live_monitoring_m_descr); R.string.live_monitoring_m_descr);
cat.addPreference(liveMonitoring); cat.addPreference(liveMonitoring);