Fix #10540
This commit is contained in:
parent
3108dfbfbe
commit
ac11686646
1 changed files with 32 additions and 26 deletions
|
@ -10,6 +10,7 @@ import android.os.AsyncTask;
|
|||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.text.Html;
|
||||
import android.text.Spanned;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
|
@ -606,28 +607,33 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
|
|||
}
|
||||
}
|
||||
|
||||
private StringBuilder generateHtmlPrint(List<FavoriteGroup> groups) {
|
||||
private String generateHtmlPrint(List<FavoriteGroup> groups) {
|
||||
StringBuilder html = new StringBuilder();
|
||||
html.append("<h1>My Favorites</h1>");
|
||||
|
||||
int MAX_AMOUNT_OF_POINTS = 100;
|
||||
int addedPoints = 0;
|
||||
for (FavoriteGroup group : groups) {
|
||||
html.append("<h3>" + group.getDisplayName(app) + "</h3>");
|
||||
for (FavouritePoint fp : group.getPoints()) {
|
||||
String url = "geo:" + ((float) fp.getLatitude()) + "," + ((float) fp.getLongitude()) + "?m=" + fp.getName();
|
||||
html.append("<p>" + fp.getDisplayName(app) + " - " + "<a href=\"" + url + "\">geo:"
|
||||
+ ((float) fp.getLatitude()) + "," + ((float) fp.getLongitude()) + "</a><br>");
|
||||
if (fp.isAddressSpecified()) {
|
||||
html.append(": " + fp.getAddress());
|
||||
html.append("<br>");
|
||||
}
|
||||
if (!Algorithms.isEmpty(fp.getDescription())) {
|
||||
html.append(": " + fp.getDescription());
|
||||
}
|
||||
html.append("</p>");
|
||||
}
|
||||
}
|
||||
return html;
|
||||
if (addedPoints >= MAX_AMOUNT_OF_POINTS) {
|
||||
break;
|
||||
}
|
||||
|
||||
float lat = (float) fp.getLatitude();
|
||||
float lon = (float) fp.getLongitude();
|
||||
String url = "geo:" + lat + "," + lon + "?m=" + fp.getName();
|
||||
html.append("<p>" + fp.getDisplayName(app) + " - <a href=\"" + url + "\">geo:"
|
||||
+ lat + "," + lon + "</a><br></p>");
|
||||
addedPoints++;
|
||||
}
|
||||
if (addedPoints >= MAX_AMOUNT_OF_POINTS) {
|
||||
html.append("<p>...</p>");
|
||||
break;
|
||||
}
|
||||
}
|
||||
return html.toString();
|
||||
}
|
||||
|
||||
private void shareFavourites() {
|
||||
if (favouritesAdapter.isEmpty()) {
|
||||
|
@ -646,6 +652,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
|
|||
|
||||
File src = null;
|
||||
File dst = null;
|
||||
Spanned descriptionOfPoints;
|
||||
|
||||
@Override
|
||||
protected void onPreExecute() {
|
||||
|
@ -662,9 +669,15 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
|
|||
|
||||
@Override
|
||||
protected Void doInBackground(Void... params) {
|
||||
List<FavoriteGroup> groups;
|
||||
if (group != null) {
|
||||
helper.saveFile(group.getPoints(), dst);
|
||||
groups = new ArrayList<>();
|
||||
groups.add(group);
|
||||
} else {
|
||||
groups = getMyApplication().getFavorites().getFavoriteGroups();
|
||||
}
|
||||
descriptionOfPoints = Html.fromHtml(generateHtmlPrint(groups));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -680,19 +693,12 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
|
|||
Algorithms.fileCopy(src, dst);
|
||||
}
|
||||
final Intent sendIntent = new Intent();
|
||||
sendIntent.setAction(Intent.ACTION_SEND);
|
||||
List<FavoriteGroup> groups;
|
||||
if (group != null) {
|
||||
groups = new ArrayList<>();
|
||||
groups.add(group);
|
||||
} else {
|
||||
groups = getMyApplication().getFavorites().getFavoriteGroups();
|
||||
}
|
||||
sendIntent.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(generateHtmlPrint(groups).toString()));
|
||||
sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject));
|
||||
sendIntent.putExtra(Intent.EXTRA_STREAM, AndroidUtils.getUriForFile(getMyApplication(), dst));
|
||||
sendIntent.setType("text/plain");
|
||||
sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
sendIntent.setAction(Intent.ACTION_SEND)
|
||||
.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject))
|
||||
.putExtra(Intent.EXTRA_TEXT, descriptionOfPoints)
|
||||
.putExtra(Intent.EXTRA_STREAM, AndroidUtils.getUriForFile(getMyApplication(), dst))
|
||||
.setType("text/plain")
|
||||
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
startActivity(sendIntent);
|
||||
} catch (IOException e) {
|
||||
Toast.makeText(getActivity(), "Error sharing favorites: " + e.getMessage(), Toast.LENGTH_SHORT).show();
|
||||
|
|
Loading…
Reference in a new issue