From 3c3391f217d028fa16dd61f059e4b2c7b8f45358 Mon Sep 17 00:00:00 2001 From: Sebastian Podjasek Date: Mon, 4 Sep 2023 11:47:24 +0200 Subject: [PATCH 1/3] Update AGP to 8.1.1 --- AutofillFramework/Application/build.gradle | 2 ++ AutofillFramework/afservice/build.gradle | 2 ++ AutofillFramework/build.gradle | 6 +++--- AutofillFramework/gradle/wrapper/gradle-wrapper.properties | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/AutofillFramework/Application/build.gradle b/AutofillFramework/Application/build.gradle index fc7d19e..a31b077 100644 --- a/AutofillFramework/Application/build.gradle +++ b/AutofillFramework/Application/build.gradle @@ -7,6 +7,8 @@ List dirs = [ 'main'] // main sample code; look here for the interesting stuff. android { + namespace 'com.example.android.autofill.app' + compileSdkVersion 28 defaultConfig { diff --git a/AutofillFramework/afservice/build.gradle b/AutofillFramework/afservice/build.gradle index 0d8bd19..b5f8ae4 100644 --- a/AutofillFramework/afservice/build.gradle +++ b/AutofillFramework/afservice/build.gradle @@ -1,6 +1,8 @@ apply plugin: 'com.android.application' android { + namespace 'com.example.android.autofill.service' + compileSdkVersion 28 defaultConfig { diff --git a/AutofillFramework/build.gradle b/AutofillFramework/build.gradle index 0c24356..0750b52 100644 --- a/AutofillFramework/build.gradle +++ b/AutofillFramework/build.gradle @@ -2,17 +2,17 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:8.1.1' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/AutofillFramework/gradle/wrapper/gradle-wrapper.properties b/AutofillFramework/gradle/wrapper/gradle-wrapper.properties index c4486d4..9274723 100644 --- a/AutofillFramework/gradle/wrapper/gradle-wrapper.properties +++ b/AutofillFramework/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Sep 04 11:10:48 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 750ac27abfe428ad11e5dff3c16aeac2577d9234 Mon Sep 17 00:00:00 2001 From: Sebastian Podjasek Date: Mon, 4 Sep 2023 11:48:34 +0200 Subject: [PATCH 2/3] Fix non-constant fields in switch Convert switch to if-else block --- .../service/settings/SettingsActivity.java | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java b/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java index 500ceec..adbcbda 100644 --- a/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java +++ b/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java @@ -137,16 +137,14 @@ public void onCreate(Bundle savedInstanceState) { break; } loggingLevelContainer.setOnCheckedChangeListener((group, checkedId) -> { - switch (checkedId) { - case R.id.loggingOff: - mPreferences.setLoggingLevel(Util.LogLevel.Off); - break; - case R.id.loggingDebug: - mPreferences.setLoggingLevel(Util.LogLevel.Debug); - break; - case R.id.loggingVerbose: - mPreferences.setLoggingLevel(Util.LogLevel.Verbose); - break; + if (checkedId == R.id.loggingOff) { + mPreferences.setLoggingLevel(Util.LogLevel.Off); + } else if (checkedId == R.id.loggingDebug) { + mPreferences.setLoggingLevel(Util.LogLevel.Debug); + } else if (checkedId == R.id.loggingVerbose) { + mPreferences.setLoggingLevel(Util.LogLevel.Verbose); + } else { + throw new IllegalStateException("Unexpected value: " + checkedId); } }); RadioGroup dalCheckRequirementContainer = findViewById(R.id.dalCheckRequirementContainer); @@ -163,16 +161,12 @@ public void onCreate(Bundle savedInstanceState) { break; } dalCheckRequirementContainer.setOnCheckedChangeListener((group, checkedId) -> { - switch (checkedId) { - case R.id.dalDisabled: - mPreferences.setDalCheckRequired(Disabled); - break; - case R.id.dalLoginOnly: - mPreferences.setDalCheckRequired(LoginOnly); - break; - case R.id.dalAllUrls: - mPreferences.setDalCheckRequired(AllUrls); - break; + if (checkedId == R.id.dalDisabled) { + mPreferences.setDalCheckRequired(Disabled); + } else if (checkedId == R.id.dalLoginOnly) { + mPreferences.setDalCheckRequired(LoginOnly); + } else if (checkedId == R.id.dalAllUrls) { + mPreferences.setDalCheckRequired(AllUrls); } }); } From 27f6eafdd2f0c7b52190fa06141a953b5827d108 Mon Sep 17 00:00:00 2001 From: Sebastian Podjasek Date: Mon, 4 Sep 2023 12:17:13 +0200 Subject: [PATCH 3/3] There wasn't a default block in switch statement before --- .../android/autofill/service/settings/SettingsActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java b/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java index adbcbda..e98d56d 100644 --- a/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java +++ b/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java @@ -143,8 +143,6 @@ public void onCreate(Bundle savedInstanceState) { mPreferences.setLoggingLevel(Util.LogLevel.Debug); } else if (checkedId == R.id.loggingVerbose) { mPreferences.setLoggingLevel(Util.LogLevel.Verbose); - } else { - throw new IllegalStateException("Unexpected value: " + checkedId); } }); RadioGroup dalCheckRequirementContainer = findViewById(R.id.dalCheckRequirementContainer);