From 8c5a8a729e310ba2aa9b432f04d9a316da0636d7 Mon Sep 17 00:00:00 2001 From: Agi Sferro Date: Tue, 31 Aug 2021 14:53:59 +0000 Subject: [PATCH] Bug 1725469 - Remove deprecated LoginStorageDelegate. r=owlish This also removes deprecated getProfileDir. Differential Revision: https://phabricator.services.mozilla.com/D122911 --- mobile/android/geckoview/api.txt | 7 --- .../org/mozilla/geckoview/Autocomplete.java | 7 --- .../org/mozilla/geckoview/GeckoRuntime.java | 50 ------------------- .../mozilla/geckoview/doc-files/CHANGELOG.md | 6 ++- 4 files changed, 5 insertions(+), 65 deletions(-) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index 4e0a41221119..8e0faa26421d 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -41,7 +41,6 @@ import java.io.InputStream; import java.lang.Boolean; import java.lang.CharSequence; import java.lang.Class; -import java.lang.Deprecated; import java.lang.Double; import java.lang.Exception; import java.lang.Float; @@ -226,9 +225,6 @@ package org.mozilla.geckoview { ctor public LoginSelectOption(@NonNull Autocomplete.LoginEntry); } - @Deprecated @DeprecationSchedule(version=93,id="login-storage") public static interface Autocomplete.LoginStorageDelegate implements Autocomplete.StorageDelegate { - } - public abstract static class Autocomplete.Option { ctor public Option(@NonNull T, int); field public final int hint; @@ -670,8 +666,6 @@ package org.mozilla.geckoview { method @NonNull @UiThread public ContentBlockingController getContentBlockingController(); method @NonNull @UiThread public static synchronized GeckoRuntime getDefault(@NonNull Context); method @Nullable @UiThread public GeckoRuntime.Delegate getDelegate(); - method @Deprecated @DeprecationSchedule(version=93,id="login-storage") @Nullable @UiThread public Autocomplete.LoginStorageDelegate getLoginStorageDelegate(); - method @Deprecated @DeprecationSchedule(id="get-profile-dir",version=93) @Nullable @UiThread public File getProfileDir(); method @NonNull @UiThread public ProfilerController getProfilerController(); method @AnyThread @NonNull public GeckoRuntimeSettings getSettings(); method @NonNull @UiThread public StorageController getStorageController(); @@ -684,7 +678,6 @@ package org.mozilla.geckoview { method @UiThread public void setActivityDelegate(@Nullable GeckoRuntime.ActivityDelegate); method @UiThread public void setAutocompleteStorageDelegate(@Nullable Autocomplete.StorageDelegate); method @UiThread public void setDelegate(@Nullable GeckoRuntime.Delegate); - method @Deprecated @DeprecationSchedule(version=93,id="login-storage") @UiThread public void setLoginStorageDelegate(@Nullable Autocomplete.LoginStorageDelegate); method @UiThread public void setServiceWorkerDelegate(@Nullable GeckoRuntime.ServiceWorkerDelegate); method @UiThread public void setWebNotificationDelegate(@Nullable WebNotificationDelegate); method @AnyThread public void shutdown(); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java index 019bbabeb8ab..a26bad0935fa 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/Autocomplete.java @@ -976,13 +976,6 @@ public class Autocomplete { @LSUsedField final int usedFields) {} } - /** - * @deprecated This API has been replaced by {@link StorageDelegate} and - * will be removed in GeckoView 93. - */ - @Deprecated @DeprecationSchedule(version = 93, id = "login-storage") - public interface LoginStorageDelegate extends StorageDelegate {} - /** * Abstract base class for Autocomplete options. * Extended by {@link Autocomplete.SaveOption} and diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java index 75e4753f398b..dd0f91ddf6f0 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java @@ -566,25 +566,6 @@ public final class GeckoRuntime implements Parcelable { mAutocompleteStorageProxy.setDelegate(delegate); } - /** - * Set the {@link Autocomplete.LoginStorageDelegate} instance on this runtime. - * This delegate is required for handling autocomplete storage requests. - * - * @param delegate The {@link Autocomplete.LoginStorageDelegate} handling - * autocomplete storage requests. - * - * @deprecated This API has been replaced by - * {@link #setAutocompleteStorageDelegate} and - * will be removed in GeckoView 93. - */ - @Deprecated @DeprecationSchedule(version = 93, id = "login-storage") - @UiThread - public void setLoginStorageDelegate( - final @Nullable Autocomplete.LoginStorageDelegate delegate) { - ThreadUtils.assertOnUiThread(); - mAutocompleteStorageProxy.setDelegate(delegate); - } - /** * Get the {@link Autocomplete.StorageDelegate} instance set on this runtime. * @@ -596,22 +577,6 @@ public final class GeckoRuntime implements Parcelable { return mAutocompleteStorageProxy.getDelegate(); } - /** - * Get the {@link Autocomplete.LoginStorageDelegate} instance set on this runtime. - * - * @return The {@link Autocomplete.LoginStorageDelegate} set on this runtime. - * - * @deprecated This API has been replaced by - * {@link #getAutocompleteStorageDelegate} and - * will be removed in GeckoView 93. - */ - @Deprecated @DeprecationSchedule(version = 93, id = "login-storage") - @UiThread - public @Nullable Autocomplete.LoginStorageDelegate getLoginStorageDelegate() { - ThreadUtils.assertOnUiThread(); - return (Autocomplete.LoginStorageDelegate)mAutocompleteStorageProxy.getDelegate(); - } - @UiThread public interface ServiceWorkerDelegate { @@ -784,21 +749,6 @@ public final class GeckoRuntime implements Parcelable { return mSettings; } - /** - * Get the profile directory for this runtime. This is where Gecko stores - * internal data. - * - * @deprecated This API is deprecated and is kept here just for compatibility, as of - * GeckoView 89 it always returns null. - * @return Profile directory - */ - @UiThread - @Deprecated - @DeprecationSchedule(id = "get-profile-dir", version = 93) - public @Nullable File getProfileDir() { - return null; - } - /** * Notify Gecko that the screen orientation has changed. */ diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md index 1037c4698e1a..ca7719565123 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md @@ -13,6 +13,10 @@ exclude: true ⚠️ breaking change and deprecation notices +## v93 +- Removed deprecated ['Autocomplete.LoginStorageDelegate'][78.8]. +- Removed deprecated [`GeckoRuntime.getProfileDir`][90.5]. + ## v92 - Added [`GeckoSession.PermissionDelegate.PERMISSION_STORAGE_ACCESS`][92.1] to control the allowing of third-party frames to access first-party cookies and @@ -1034,4 +1038,4 @@ to allow adding gecko profiler markers. [65.24]: {{javadoc_uri}}/CrashReporter.html#sendCrashReport-android.content.Context-android.os.Bundle-java.lang.String- [65.25]: {{javadoc_uri}}/GeckoResult.html -[api-version]: d0ed6375463fed98d5402a30aacb6eee7969079e +[api-version]: 2edc01bfffedf1eb28688320a804e243e77f67f2