Remove KeyringInfo

brave · Oct 13, 2023 · a97adf1 · a97adf1
1 parent 3123f75
commit a97adf1
Show file tree

Hide file tree

Showing 30 changed files with 235 additions and 493 deletions.
diff --git a/android/java/org/chromium/chrome/browser/app/domain/DappsModel.java b/android/java/org/chromium/chrome/browser/app/domain/DappsModel.java
@@ -13,7 +13,6 @@
 import org.chromium.brave_wallet.mojom.ByteArrayStringUnion;
 import org.chromium.brave_wallet.mojom.CoinType;
 import org.chromium.brave_wallet.mojom.JsonRpcService;
-import org.chromium.brave_wallet.mojom.KeyringId;
 import org.chromium.brave_wallet.mojom.KeyringService;
 import org.chromium.brave_wallet.mojom.KeyringServiceObserver;
 import org.chromium.brave_wallet.mojom.SignAllTransactionsRequest;
@@ -296,13 +295,13 @@ private void updatePendingAccountCreationRequest() {
     }
 
     @Override
-    public void keyringCreated(@KeyringId.EnumType int keyringId) {}
+    public void walletCreated() {}
 
     @Override
     public void walletRestored() {}
 
     @Override
-    public void keyringReset() {}
+    public void walletReset() {}
 
     @Override
     public void locked() {}

diff --git a/android/java/org/chromium/chrome/browser/app/domain/KeyringModel.java b/android/java/org/chromium/chrome/browser/app/domain/KeyringModel.java
@@ -160,7 +160,7 @@ private void handleAddAccountResult(AccountInfo result, Callbacks.Callback1<Bool
     }
 
     @Override
-    public void keyringCreated(@KeyringId.EnumType int keyringId) {
+    public void walletCreated() {
         update();
     }
 
@@ -170,7 +170,7 @@ public void walletRestored() {
     }
 
     @Override
-    public void keyringReset() {
+    public void walletReset() {
         update();
     }
 

diff --git a/.../java/org/chromium/chrome/browser/crypto_wallet/observers/KeyringServiceObserverImpl.java b/.../java/org/chromium/chrome/browser/crypto_wallet/observers/KeyringServiceObserverImpl.java
@@ -7,7 +7,6 @@
 
 import org.chromium.brave_wallet.mojom.AccountInfo;
 import org.chromium.brave_wallet.mojom.CoinType;
-import org.chromium.brave_wallet.mojom.KeyringId;
 import org.chromium.brave_wallet.mojom.KeyringServiceObserver;
 import org.chromium.mojo.system.MojoException;
 
@@ -17,9 +16,9 @@ public class KeyringServiceObserverImpl implements KeyringServiceObserver {
     public interface KeyringServiceObserverImplDelegate {
         default void locked() {}
         default void backedUp() {}
-        default void keyringCreated(@KeyringId.EnumType int keyringId) {}
+        default void walletCreated() {}
         default void walletRestored() {}
-        default void keyringReset() {}
+        default void walletReset() {}
         default void unlocked() {}
         default void accountsChanged() {}
         default void accountsAdded(AccountInfo[] addedAccounts) {}
@@ -36,8 +35,8 @@ public KeyringServiceObserverImpl(KeyringServiceObserverImplDelegate delegate) {
     }
 
     @Override
-    public void keyringCreated(@KeyringId.EnumType int keyringId) {
-        if (isActive()) getRef().keyringCreated(keyringId);
+    public void walletCreated() {
+        if (isActive()) getRef().walletCreated();
     }
 
     @Override
@@ -46,8 +45,8 @@ public void walletRestored() {
     }
 
     @Override
-    public void keyringReset() {
-        if (isActive()) getRef().keyringReset();
+    public void walletReset() {
+        if (isActive()) getRef().walletReset();
     }
 
     @Override