Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-05-02 21:52:17 +02:00
commit 3c03a49904
2 changed files with 2 additions and 1 deletions

View file

@ -1,7 +1,7 @@
<?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">
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<application <application
android:icon="@mipmap/icon_nightly" android:icon="@mipmap/icon_nightly"
tools:replace="android:icon"> tools:replace="android:icon">

View file

@ -110,6 +110,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
} else if(operationId == INSTALL_BUILD){ } else if(operationId == INSTALL_BUILD){
if(currentSelectedBuild != null){ if(currentSelectedBuild != null){
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
intent.setDataAndType(Uri.fromFile(pathToDownload), "application/vnd.android.package-archive"); intent.setDataAndType(Uri.fromFile(pathToDownload), "application/vnd.android.package-archive");
startActivityForResult(intent, ACTIVITY_TO_INSTALL); startActivityForResult(intent, ACTIVITY_TO_INSTALL);
updateInstalledApp(false, currentSelectedBuild.date); updateInstalledApp(false, currentSelectedBuild.date);