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

Use https in all places

Browse source
This commit is contained in:
Victor Shcherb 2018-05-13 23:59:44 +02:00
parent b33358b159
commit f89bd27059
11 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/map/TileSourceManager.java
View file

@ -460,7 +460,7 @@ public class TileSourceManager {
public static List<TileSourceTemplate> downloadTileSourceTemplates(String versionAsUrl) { public static List<TileSourceTemplate> downloadTileSourceTemplates(String versionAsUrl) {
final List<TileSourceTemplate> templates = new ArrayList<TileSourceTemplate>(); final List<TileSourceTemplate> templates = new ArrayList<TileSourceTemplate>();
try { try {
URLConnection connection = NetworkUtils.getHttpURLConnection("http://download.osmand.net//tile_sources.php?" + versionAsUrl); URLConnection connection = NetworkUtils.getHttpURLConnection("https://osmand.net/tile_sources?" + versionAsUrl);
XmlPullParser parser = PlatformUtil.newXMLPullParser(); XmlPullParser parser = PlatformUtil.newXMLPullParser();
parser.setInput(connection.getInputStream(), "UTF-8"); parser.setInput(connection.getInputStream(), "UTF-8");
int tok; int tok;

6
OsmAnd-java/src/net/osmand/router/TurnType.java
View file

@ -416,9 +416,9 @@ public class TurnType {
public static int convertType(String lane) { public static int convertType(String lane) {
int turn; int turn;
// merge should be recognized as continue route (but it could displayed differently) // merge should be recognized as continue route (but it could displayed differently)
if (lane.equals("none") || lane.equals("through") || if (lane.equals("none") || lane.equals("through")
lane.equals("merge_to_left") || || lane.equals("merge_to_left")
lane.equals("merge_to_right")) { || lane.equals("merge_to_right")) {
turn = TurnType.C; turn = TurnType.C;
} else if (lane.equals("slight_right") ) { } else if (lane.equals("slight_right") ) {
turn = TurnType.TSLR; turn = TurnType.TSLR;

4
OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
View file

@ -41,8 +41,8 @@ public class ContributionVersionActivity extends OsmandListActivity {
private static final int INSTALL_BUILD = 2; private static final int INSTALL_BUILD = 2;
private static final int ACTIVITY_TO_INSTALL = 23; private static final int ACTIVITY_TO_INSTALL = 23;
private static final String URL_TO_RETRIEVE_BUILDS = "https://download.osmand.net/builds.php"; private static final String URL_TO_RETRIEVE_BUILDS = "https://osmand.net/builds";
private static final String URL_GET_BUILD = "https://download.osmand.net/"; private static final String URL_GET_BUILD = "https://osmand.net/";
private ProgressDialog progressDlg; private ProgressDialog progressDlg;
private Date currentInstalledDate; private Date currentInstalledDate;

2
OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
View file

@ -287,7 +287,7 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
parameters.put("email", email); parameters.put("email", email);
return AndroidNetworkUtils.sendRequest(getMyApplication(), return AndroidNetworkUtils.sendRequest(getMyApplication(),
"http://download.osmand.net/subscription/register_email.php", "https://osmand.net/subscription/register_email",
parameters, "Subscribing email...", true, true); parameters, "Subscribing email...", true, true);
} catch (Exception e) { } catch (Exception e) {

4
OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
View file

@ -487,7 +487,7 @@ public class InAppPurchaseHelper {
} }
return AndroidNetworkUtils.sendRequest(ctx, return AndroidNetworkUtils.sendRequest(ctx,
"http://download.osmand.net/subscription/register.php", "https://osmand.net/subscription/register",
parameters, "Requesting userId...", true, true); parameters, "Requesting userId...", true, true);
} catch (Exception e) { } catch (Exception e) {
@ -681,7 +681,7 @@ public class InAppPurchaseHelper {
parameters.put("token", token); parameters.put("token", token);
AndroidNetworkUtils.sendRequestAsync(ctx, AndroidNetworkUtils.sendRequestAsync(ctx,
"http://download.osmand.net/subscription/purchased.php", "https://osmand.net/subscription/purchased",
parameters, "Sending purchase info...", true, true, new OnRequestResultListener() { parameters, "Sending purchase info...", true, true, new OnRequestResultListener() {
@Override @Override
public void onResult(String result) { public void onResult(String result) {

2
OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
View file

@ -201,7 +201,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
readMoreBtn.setOnClickListener(new View.OnClickListener() { readMoreBtn.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Uri uri = Uri.parse("https://osmand.net/osm_live.php"); Uri uri = Uri.parse("https://osmand.net/osm_live");
Intent goToOsmLive = new Intent(Intent.ACTION_VIEW, uri); Intent goToOsmLive = new Intent(Intent.ACTION_VIEW, uri);
startActivity(goToOsmLive); startActivity(goToOsmLive);
} }

2
OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
View file

@ -43,7 +43,7 @@ import java.util.Locale;
public class ReportsFragment extends BaseOsmAndFragment implements CountrySelectionFragment.OnFragmentInteractionListener { public class ReportsFragment extends BaseOsmAndFragment implements CountrySelectionFragment.OnFragmentInteractionListener {
public static final int TITLE = R.string.report; public static final int TITLE = R.string.report;
public static final String DOMAIN = "http://download.osmand.net/"; public static final String DOMAIN = "https://osmand.net/";
public static final String TOTAL_CHANGES_BY_MONTH_URL_PATTERN = DOMAIN + public static final String TOTAL_CHANGES_BY_MONTH_URL_PATTERN = DOMAIN +
"reports/query_report.php?report=total_changes_by_month&month=%s&region=%s"; "reports/query_report.php?report=total_changes_by_month&month=%s&region=%s";
public static final String USERS_RANKING_BY_MONTH = DOMAIN + public static final String USERS_RANKING_BY_MONTH = DOMAIN +

2
OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
View file

@ -229,7 +229,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
showProgress(null); showProgress(null);
AndroidNetworkUtils.sendRequestAsync(getMyApplication(), AndroidNetworkUtils.sendRequestAsync(getMyApplication(),
"http://download.osmand.net/subscription/update.php", "https://osmand.net/subscription/update",
parameters, "Sending data...", true, true, new AndroidNetworkUtils.OnRequestResultListener() { parameters, "Sending data...", true, true, new AndroidNetworkUtils.OnRequestResultListener() {
@Override @Override
public void onResult(String result) { public void onResult(String result) {

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java
View file

@ -446,7 +446,7 @@ public abstract class ImageCard extends AbstractCard {
if (this.params != null) { if (this.params != null) {
pms.putAll(this.params); pms.putAll(this.params);
} }
String response = AndroidNetworkUtils.sendRequest(app, "https://osmand.net/api/cm_place.php", pms, String response = AndroidNetworkUtils.sendRequest(app, "https://osmand.net/api/cm_place", pms,
"Requesting location images...", false, false); "Requesting location images...", false, false);
if (!Algorithms.isEmpty(response)) { if (!Algorithms.isEmpty(response)) {

4
OsmAnd/src/net/osmand/plus/mapillary/MapillaryImageDialog.java
View file

@ -64,9 +64,9 @@ public class MapillaryImageDialog extends ContextMenuCardDialog {
private static final String KEY_MAPILLARY_DIALOG_CA = "key_mapillary_dialog_ca"; private static final String KEY_MAPILLARY_DIALOG_CA = "key_mapillary_dialog_ca";
private static final String MAPILLARY_VIEWER_URL_TEMPLATE = private static final String MAPILLARY_VIEWER_URL_TEMPLATE =
"https://osmand.net/api/mapillary/photo-viewer.php?photo_id="; "https://osmand.net/api/mapillary/photo-viewer?photo_id=";
private static final String MAPILLARY_HIRES_IMAGE_URL_TEMPLATE = private static final String MAPILLARY_HIRES_IMAGE_URL_TEMPLATE =
"https://osmand.net/api/mapillary/get_photo.php?hires=true&photo_id="; "https://osmand.net/api/mapillary/get_photo?hires=true&photo_id=";
private static final String WEBGL_ERROR_MESSAGE = "Error creating WebGL context"; private static final String WEBGL_ERROR_MESSAGE = "Error creating WebGL context";

2
OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
View file

@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class IncrementalChangesManager { public class IncrementalChangesManager {
private static final String URL = "http://download.osmand.net/check_live.php"; private static final String URL = "https://osmand.net/check_live";
private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(IncrementalChangesManager.class); private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(IncrementalChangesManager.class);
private ResourceManager resourceManager; private ResourceManager resourceManager;
private final Map<String, RegionUpdateFiles> regions = new ConcurrentHashMap<String, IncrementalChangesManager.RegionUpdateFiles>(); private final Map<String, RegionUpdateFiles> regions = new ConcurrentHashMap<String, IncrementalChangesManager.RegionUpdateFiles>();