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

merge

Browse source
This commit is contained in:
GaidamakUA 2016-03-21 11:58:02 +02:00
parent a3d95d0213
commit dc562279b9
4 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OsmAnd/AndroidManifest-free.xml
View file

@ -1,11 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<application tools:replace="android:icon"
android:icon="@drawable/icon_free"> <application
<service tools:replace="android:process" android:icon="@drawable/icon_free"
android:process="net.osmand" tools:replace="android:icon">
android:name="net.osmand.plus.NavigationService"/>
<service
</application> android:name="net.osmand.plus.NavigationService"
android:process="net.osmand"
tools:replace="android:process"/>
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="net.osmand.fileprovider"
tools:replace="android:authorities"/>
</application>
</manifest> </manifest>

22
OsmAnd/AndroidManifest-freedev.xml
View file

@ -1,11 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<application tools:replace="android:icon"
android:icon="@drawable/icon_free"> <application
<service tools:replace="android:process" android:icon="@drawable/icon_free"
android:process="net.osmand.dev" tools:replace="android:icon">
android:name="net.osmand.plus.NavigationService"/> <service
android:name="net.osmand.plus.NavigationService"
</application> android:process="net.osmand.dev"
tools:replace="android:process"/>
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="net.osmand.dev.fileprovider"
tools:replace="android:authorities"/>
</application>
</manifest> </manifest>

2
OsmAnd/AndroidManifest.xml
View file

@ -64,7 +64,7 @@
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="net.osmand.fileprovider" android:authorities="net.osmand.plus.fileprovider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true" > android:grantUriPermissions="true" >
<meta-data <meta-data

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

@ -580,7 +580,9 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
sendIntent.setAction(Intent.ACTION_SEND); sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_TEXT, "Favourites.gpx:\n\n\n" + GPXUtilities.asString(gpxFile, getMyApplication())); sendIntent.putExtra(Intent.EXTRA_TEXT, "Favourites.gpx:\n\n\n" + GPXUtilities.asString(gpxFile, getMyApplication()));
sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject)); sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject));
sendIntent.putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(getActivity(), "net.osmand.fileprovider", dst)); sendIntent.putExtra(Intent.EXTRA_STREAM,
FileProvider.getUriForFile(getActivity(),
getActivity().getPackageName() + ".fileprovider", dst));
sendIntent.setType("text/plain"); sendIntent.setType("text/plain");
startActivity(sendIntent); startActivity(sendIntent);
} catch (IOException e) { } catch (IOException e) {