CAKE-192 | merged main branch into current; fixed call unstoppable domains api for different sdk versions; fixed italian and croatian locales

2025-01-03 09:29:48 +00:00 · 2021-05-24 21:06:12 +03:00 · 2021-05-24 21:06:12 +03:00 · 4d6cc87529
commit 4d6cc87529
parent 251d6ad502
12 changed files with 85 additions and 90 deletions
--- a/android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java
+++ b/android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java
@ -10,29 +10,29 @@ import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;

 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;

-import java.security.SecureRandom;
 import com.unstoppabledomains.resolution.DomainResolution;
 import com.unstoppabledomains.resolution.Resolution;

-import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.Looper;
-
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
+import java.security.SecureRandom;

 public class MainActivity extends FlutterFragmentActivity {
    final String UTILS_CHANNEL = "com.cake_wallet/native_utils";
-
    final String UNSTOPPABLE_DOMAIN_CHANNEL = "com.cakewallet.cake_wallet/unstoppable-domain";

    @Override
    public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
        GeneratedPluginRegistrant.registerWith(flutterEngine);

+        MethodChannel utilsChannel =
+                new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(),
+                        UTILS_CHANNEL);
+
+        utilsChannel.setMethodCallHandler(this::handle);
+
        MethodChannel unstoppableDomainChannel =
                new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(),
                        UNSTOPPABLE_DOMAIN_CHANNEL);
@ -41,14 +41,30 @@ public class MainActivity extends FlutterFragmentActivity {
    }

    private void handle(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
+        Handler handler = new Handler(Looper.getMainLooper());
+
        try {
-            if (call.method.equals("getUnstoppableDomainAddress")) {
+            switch (call.method) {
+                case "sec_random":
+                    int count = call.argument("count");
+                    SecureRandom random = new SecureRandom();
+                    byte bytes[] = new byte[count];
+                    random.nextBytes(bytes);
+                    handler.post(() -> result.success(bytes));
+                    break;
+                case "getUnstoppableDomainAddress":
+                    int  version = Build.VERSION.SDK_INT;
+                    if (version >= 24) {
                        getUnstoppableDomainAddress(call, result);
                    } else {
-                result.notImplemented();
+                        handler.post(() -> result.success(""));
+                    }
+                    break;
+                default:
+                    handler.post(() -> result.notImplemented());
            }
        } catch (Exception e) {
-            result.error("UNCAUGHT_ERROR", e.getMessage(), null);
+            handler.post(() -> result.error("UNCAUGHT_ERROR", e.getMessage(), null));
        }
    }

@ -66,29 +82,5 @@ public class MainActivity extends FlutterFragmentActivity {
                handler.post(() -> result.error("INVALID DOMAIN", e.getMessage(), null));
            }
        });
-
-        MethodChannel utilsChannel =
-                new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(),
-                        UTILS_CHANNEL);
-
-        utilsChannel.setMethodCallHandler(this::handle);
-    }
-
-    private void handle(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
-        Handler handler = new Handler(Looper.getMainLooper());
-
-        try {
-            if (call.method.equals("sec_random")) {
-                int count = call.argument("count");
-                SecureRandom random = new SecureRandom();
-                byte bytes[] = new byte[count];
-                random.nextBytes(bytes);
-                handler.post(() -> result.success(bytes));
-            } else {
-                handler.post(() -> result.notImplemented());
-            }
-        } catch (Exception e) {
-            handler.post(() -> result.error("UNCAUGHT_ERROR", e.getMessage(), null));
-        }
    }
 }
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@ -17,11 +17,6 @@ import UnstoppableDomainsResolution
            name: "com.cakewallet.cakewallet/legacy_wallet_migration",
            binaryMessenger: controller.binaryMessenger)
        legacyMigrationChannel.setMethodCallHandler({
-        let batteryChannel = FlutterMethodChannel(name: "com.cakewallet.cakewallet/legacy_wallet_migration",
-                                                  binaryMessenger: controller.binaryMessenger)
-        let unstoppableDomainChannel = FlutterMethodChannel(name: "com.cakewallet.cake_wallet/unstoppable-domain", binaryMessenger: controller.binaryMessenger)
-
-        batteryChannel.setMethodCallHandler({
            (call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in
            
            switch call.method {
@ -81,6 +76,7 @@ import UnstoppableDomainsResolution
            }
        })
        
+        let unstoppableDomainChannel = FlutterMethodChannel(name: "com.cakewallet.cake_wallet/unstoppable-domain", binaryMessenger: controller.binaryMessenger)
        unstoppableDomainChannel.setMethodCallHandler({ [weak self]
                            (call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in
                            switch call.method {
--- a/pubspec.lock
+++ b/pubspec.lock
@ -70,7 +70,7 @@ packages:
      path: "."
      ref: cake
      resolved-ref: "02fef082f20af13de00b4e64efb93a2c1e5e1cf2"
-      url: "git@github.com:cake-tech/bech32.git"
+      url: "https://github.com/cake-tech/bech32.git"
    source: git
    version: "0.2.0"
  bip32:
@ -92,8 +92,8 @@ packages:
    description:
      path: "."
      ref: cake
-      resolved-ref: b3ab2926c665f0e68b74a4a5f31059f7fcd817b7
-      url: "git@github.com:cake-tech/bitcoin_flutter.git"
+      resolved-ref: cbabfd87b6ce3cae6051a3e86ddb56e7a934e188
+      url: "https://github.com/cake-tech/bitcoin_flutter.git"
    source: git
    version: "2.0.2"
  boolean_selector:
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -474,7 +474,7 @@
  "buy_alert_content" : "Derzeit unterstützen wir nur den Kauf von Bitcoin. Um Bitcoin zu kaufen, erstellen Sie bitte Ihre Bitcoin-Brieftasche oder wechseln Sie zu dieser",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",

  "address_detected" : "Adresse erkannt",
  "address_from_domain" : "Sie haben die Adresse von der unaufhaltsamen Domain ${domain} erhalten"
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -474,7 +474,7 @@
  "buy_alert_content" : "Currently we only support the purchase of Bitcoin. To buy Bitcoin, please create or switch to your Bitcoin wallet",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",

  "address_detected" : "Address detected",
  "address_from_domain" : "You got address from unstoppable domain ${domain}"
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -474,7 +474,7 @@
  "buy_alert_content" : "Actualmente solo apoyamos la compra de Bitcoin. Para comprar Bitcoin, cree o cambie a su billetera Bitcoin",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",

  "address_detected" : "Dirección detectada",
  "address_from_domain" : "Tienes la dirección de unstoppable domain ${domain}"
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -474,7 +474,7 @@
  "buy_alert_content" : "वर्तमान में हम केवल बिटकॉइन की खरीद का समर्थन करते हैं। बिटकॉइन खरीदने के लिए, कृपया अपना बिटकॉइन वॉलेट बनाएं या स्विच करें",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",

  "address_detected" : "पता लग गया",
  "address_from_domain" : "आपको अजेय डोमेन ${domain} से पता मिला है"
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@ -474,5 +474,8 @@
  "buy_alert_content" : "Currently we only support the purchase of Bitcoin. To buy Bitcoin, please create or switch to your Bitcoin wallet",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",
+
+  "address_detected" : "Adresa je otkrivena",
+  "address_from_domain" : "Dobili ste adresu od unstoppable domain ${domain}"
 }
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@ -474,5 +474,8 @@
  "buy_alert_content" : "Currently we only support the purchase of Bitcoin. To buy Bitcoin, please create or switch to your Bitcoin wallet",
  
  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",
+
+  "address_detected" : "Indirizzo rilevato",
+  "address_from_domain" : "Hai l'indirizzo da unstoppable domain ${domain}"
 }
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@ -474,7 +474,7 @@
  "buy_alert_content" : "現在、ビットコインの購入のみをサポートしています。 ビットコインを購入するには、ビットコインウォレットを作成するか切り替えてください",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",

  "address_detected" : "アドレスが検出されました",
  "address_from_domain" : "あなたはからアドレスを得ました unstoppable domain ${domain}"
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@ -474,7 +474,7 @@
  "buy_alert_content" : "현재 우리는 비트 코인 구매 만 지원합니다. 비트 코인을 구매하려면 비트 코인 지갑을 생성하거나 전환하십시오",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",
-  "understand" : "I understand"
+  "understand" : "I understand",

  "address_detected" : "주소 감지",
  "address_from_domain" : "주소는 unstoppable domain ${domain}"
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@ -469,6 +469,7 @@
  "displayable" : "可显示",

  "submit_request" : "提交请求",
+
  "buy_alert_content" : "目前，我們僅支持購買比特幣。 要購買比特幣，請創建或切換到您的比特幣錢包",

  "outdated_electrum_wallet_desceription" : "New Bitcoin wallets created in Cake now have a 24-word seed. It is mandatory that you create a new Bitcoin wallet and transfer all of your funds to the new 24-word wallet, and stop using wallets with a 12-word seed. Please do this immediately to secure your funds.",