yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

ask for install permission if on an attached apk was tapped (Android API 26+), fixes #1492

Browse source
This commit is contained in:
cyberta 2020-07-28 10:53:52 +02:00
parent 78dc025b13
commit 005f707658
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AndroidManifest.xml
View file

@ -33,6 +33,7 @@
<uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" /> <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<application android:name=".ApplicationContext" <application android:name=".ApplicationContext"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"

22
src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
View file

@ -9,15 +9,16 @@ import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Settings;
import android.util.Log; import android.util.Log;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import com.b44t.messenger.DcChat; import com.b44t.messenger.DcChat;
import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContact;
import com.b44t.messenger.DcContext; import com.b44t.messenger.DcContext;
@ -220,7 +221,7 @@ public class ApplicationDcContext extends DcContext {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(uri, mimeType); intent.setDataAndType(uri, mimeType);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
activity.startActivity(intent); startActivity((Activity) activity, intent);
} else { } else {
Intent intent = new Intent(Intent.ACTION_SEND); Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType(mimeType); intent.setType(mimeType);
@ -234,6 +235,17 @@ public class ApplicationDcContext extends DcContext {
} }
} }
private void startActivity(Activity activity, Intent intent) {
// request for permission to install apks on API 26+ if intent mimetype is an apk
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
"application/vnd.android.package-archive".equals(intent.getType()) &&
!activity.getPackageManager().canRequestPackageInstalls()) {
activity.startActivity(new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).setData(Uri.parse(String.format("package:%s", activity.getPackageName()))));
return;
}
activity.startActivity(intent);
}
private String checkMime(String path, String mimeType) { private String checkMime(String path, String mimeType) {
if(mimeType == null || mimeType.equals("application/octet-stream")) { if(mimeType == null || mimeType.equals("application/octet-stream")) {
path = path.replaceAll(" ", ""); path = path.replaceAll(" ", "");