Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-4327] Adjust LaunchMode of WebAuth & Autofill helper activities #2824

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[PM-4327] Adjust LaunchMode of WebAuth & Autofill helper activities #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9e9143
Adjust LaunchMode of WebAuth & Autofill helper activities
mpbw2 Oct 13, 2023
f52e5ce
Merge branch 'master' into bugfix/helper-activities-launchmode
mpbw2 Oct 13, 2023
329103b
Merge branch 'main' into bugfix/helper-activities-launchmode
fedemkr May 6, 2024
df2f023
PM-4327 Changed LaunchMode to SingleInstance to avoid security issues.
fedemkr May 7, 2024
5aeb3ce
Merge branch 'main' into bugfix/helper-activities-launchmode
fedemkr May 13, 2024
22f0c93
PM-PM-4327 Changed LaunchMode to SingleInstance to avoid security iss…
fedemkr May 14, 2024
f7a7080
PM-4327 Comments clearing
fedemkr May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/App/Platforms/Android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true" />
<!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
<meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true" />
<!-- Declare MainActivity manually so we can set LaunchMode using API dependant resource -->
<!-- Declare exported activities manually so we can set LaunchMode using API dependant resource -->
<activity android:name="com.x8bit.bitwarden.MainActivity" android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|uiMode" android:exported="true" android:icon="@mipmap/ic_launcher" android:label="Bitwarden" android:launchMode="@integer/launchModeAPIlevel" android:theme="@style/LaunchTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -39,6 +39,14 @@
<data android:mimeType="text/*" />
</intent-filter>
</activity>
<activity android:name="com.x8bit.bitwarden.WebAuthCallbackActivity" android:launchMode="@integer/webAuthCallbackLaunchMode" android:noHistory="true" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="bitwarden" />
</intent-filter>
</activity>
</application>
<!-- Support for Xamarin.Essentials.Browser.OpenAsync (for Android > 11) -->
<!-- Related docs: https://learn.microsoft.com/en-us/xamarin/essentials/open-browser?tabs=android -->
Expand Down
3 changes: 2 additions & 1 deletion src/App/Platforms/Android/Autofill/AutofillExternalSelectionActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ namespace Bit.Droid.Autofill
{
[Activity(
NoHistory = true,
LaunchMode = LaunchMode.SingleTop)]
LaunchMode = LaunchMode.SingleTop,
Exported = false)]
public class AutofillExternalSelectionActivity : MauiAppCompatActivity
{
protected override void OnCreate(Bundle bundle)
Expand Down
1 change: 1 addition & 0 deletions src/App/Platforms/Android/Resources/values-v30/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<resources>
<integer name="launchModeAPIlevel">0</integer>
<integer name="webAuthCallbackLaunchMode">1</integer>
</resources>
1 change: 1 addition & 0 deletions src/App/Platforms/Android/Resources/values/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<resources>
<integer name="launchModeAPIlevel">2</integer>
<integer name="webAuthCallbackLaunchMode">3</integer>
</resources>
9 changes: 2 additions & 7 deletions src/App/Platforms/Android/WebAuthCallbackActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
using Android.App;
using Android.Content.PM;
using Android.OS;
using Android.Runtime;
using Bit.App.Droid.Utilities;

namespace Bit.Droid
{
[Activity(
NoHistory = true,
LaunchMode = LaunchMode.SingleTop,
Exported = true)]
[IntentFilter(new[] { Android.Content.Intent.ActionView },
Categories = new[] { Android.Content.Intent.CategoryDefault, Android.Content.Intent.CategoryBrowsable },
DataScheme = "bitwarden")]
[Register("com.x8bit.bitwarden.WebAuthCallbackActivity")]
public class WebAuthCallbackActivity : WebAuthenticatorCallbackActivity
{
protected override void OnCreate(Bundle savedInstanceState)
Expand Down