Android 14: fixed PGP

pull/213/head
M66B 2 years ago
parent 21c71ffcc8
commit d508aefbfc

@ -718,7 +718,8 @@ public class FragmentBase extends Fragment {
startIntentSenderForResult( startIntentSenderForResult(
ex.getUserAction().getActionIntent().getIntentSender(), ex.getUserAction().getActionIntent().getIntentSender(),
REQUEST_RECOVERABLE_PERMISSION, REQUEST_RECOVERABLE_PERMISSION,
null, 0, 0, 0, null); null, 0, 0, 0,
Helper.getBackgroundActivityOptions());
} catch (IntentSender.SendIntentException ex) { } catch (IntentSender.SendIntentException ex) {
Log.w(ex); Log.w(ex);
} }

@ -26,6 +26,7 @@ import static android.view.inputmethod.EditorInfo.IME_FLAG_NO_FULLSCREEN;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityOptions;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
@ -4098,9 +4099,9 @@ public class FragmentCompose extends FragmentBase {
startIntentSenderForResult( startIntentSenderForResult(
pi.getIntentSender(), pi.getIntentSender(),
REQUEST_OPENPGP, REQUEST_OPENPGP,
null, 0, 0, 0, null); null, 0, 0, 0,
Helper.getBackgroundActivityOptions());
} catch (IntentSender.SendIntentException ex) { } catch (IntentSender.SendIntentException ex) {
Log.e(ex);
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
else { else {

@ -8885,7 +8885,8 @@ public class FragmentMessages extends FragmentBase
startIntentSenderForResult( startIntentSenderForResult(
pi.getIntentSender(), pi.getIntentSender(),
REQUEST_OPENPGP, REQUEST_OPENPGP,
null, 0, 0, 0, null); null, 0, 0, 0,
Helper.getBackgroundActivityOptions());
} catch (IntentSender.SendIntentException ex) { } catch (IntentSender.SendIntentException ex) {
// Likely cancelled // Likely cancelled
Log.w(ex); Log.w(ex);

@ -30,6 +30,7 @@ import android.animation.ObjectAnimator;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.ApplicationExitInfo; import android.app.ApplicationExitInfo;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.NotificationManager; import android.app.NotificationManager;
@ -1769,6 +1770,14 @@ public class Helper {
} }
} }
static Bundle getBackgroundActivityOptions() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
return null;
ActivityOptions options = ActivityOptions.makeBasic();
options.setPendingIntentBackgroundActivityLaunchAllowed(true);
return options.toBundle();
}
// Graphics // Graphics
static int dp2pixels(Context context, int dp) { static int dp2pixels(Context context, int dp) {

Loading…
Cancel
Save