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

Update Matter SDK to show Authorisation dialog only for account login flow. #33470

Merged
merged 8 commits into from
May 16, 2024
Merged

Update Matter SDK to show Authorisation dialog only for account login flow. #33470

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bdb295d
[Problem]
osama10 May 15, 2024
f46aa42
Restyled by google-java-format
restyled-commits May 15, 2024
8a1205d
Update MatterCommissioningPrompter.java
lazarkov May 15, 2024
380b927
Restyled by whitespace
restyled-commits May 15, 2024
4340eb7
Restyled by google-java-format
restyled-commits May 15, 2024
a02741b
Merge branch 'master' into disable-authorisation-dialogue
lazarkov May 15, 2024
f760969
Merge branch 'master' into disable-authorisation-dialogue
lazarkov May 15, 2024
4498a26
Merge branch 'master' into disable-authorisation-dialogue
osama10 May 15, 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
13 changes: 13 additions & 0 deletions ...roid/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import android.app.Activity;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.ContentResolver;
import android.content.Context;
import android.os.Build;
import android.provider.Settings;
import android.util.Log;
import android.widget.EditText;
import androidx.appcompat.app.AlertDialog;
Expand Down Expand Up @@ -45,6 +47,17 @@ public void promptForCommissionOkPermission(
+ ". Commissionee: "
+ commissioneeName);

ContentResolver contentResolver = context.getContentResolver();
boolean authorisationDialogDisabled =
Settings.Secure.getInt(contentResolver, "matter_show_authorisation_dialog", 0) == 0;
// By default do not show authorisation dialog
// only do so if customer or OS explicitly ask for it, by updating
// matter_show_authorisation_dialog flag to 1
if (authorisationDialogDisabled) {
OnPromptAccepted();
return;
}

getActivity()
.runOnUiThread(
() -> {
Expand Down
Loading