From 64e45a9f102e0b9d4ba5fc955e0cbc7edcaa526a Mon Sep 17 00:00:00 2001
From: Kerry Washington <mrkerrywashington@icloud.com>
Date: Wed, 27 Mar 2024 01:07:05 -0700
Subject: [PATCH] Added PAD (#169)

refactored to get compile

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>
---
 app/build.gradle                                      |  4 ++--
 app/src/main/java/com/breadwallet/BreadApp.java       |  4 ----
 .../main/java/com/breadwallet/tools/util/Utils.java   | 11 +++++++++--
 fast_follow_asset_pack_01/build.gradle                |  8 ++++++++
 install_time_asset_pack/build.gradle                  |  8 ++++++++
 settings.gradle                                       |  3 ++-
 6 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 fast_follow_asset_pack_01/build.gradle
 create mode 100644 install_time_asset_pack/build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index f100513d6..5514fc5d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
         dataBinding true
         buildConfig true
     }
-
+    assetPacks = [":install_time_asset_pack",":fast_follow_asset_pack_01"]
     signingConfigs {
         release {
             storeFile file(RELEASE_STORE_FILE)
@@ -65,7 +65,7 @@ android {
         applicationId = 'com.loafwallet'
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 738
+        versionCode 20240326
         versionName "v2.9.1"
         multiDexEnabled true
         archivesBaseName = "${versionName}(${versionCode})"
diff --git a/app/src/main/java/com/breadwallet/BreadApp.java b/app/src/main/java/com/breadwallet/BreadApp.java
index 2997a1641..356d6b7cc 100644
--- a/app/src/main/java/com/breadwallet/BreadApp.java
+++ b/app/src/main/java/com/breadwallet/BreadApp.java
@@ -36,10 +36,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import com.pusher.pushnotifications.PushNotifications;
 
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import timber.log.Timber;
 
 public class BreadApp extends Application {
diff --git a/app/src/main/java/com/breadwallet/tools/util/Utils.java b/app/src/main/java/com/breadwallet/tools/util/Utils.java
index f4f2288b3..0634cfd0d 100644
--- a/app/src/main/java/com/breadwallet/tools/util/Utils.java
+++ b/app/src/main/java/com/breadwallet/tools/util/Utils.java
@@ -224,7 +224,10 @@ public static String join(String[] array, CharSequence separator) {
         return stringBuilder.toString();
     }
     public static String fetchPartnerKey(Context app, PartnerNames name) {
-    JSONObject keyObject;
+
+        Timber.d("timber: fetch name: %s", name);
+
+        JSONObject keyObject;
         AssetManager assetManager = app.getAssets();
         try (InputStream inputStream = assetManager.open("partner-keys.json")) {
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
@@ -234,11 +237,15 @@ public static String fetchPartnerKey(Context app, PartnerNames name) {
                     sb.append(line);
                 }
                 keyObject = new JSONObject(sb.toString()).getJSONObject("keys");
+                Timber.d("timber: fetch obj: %s", keyObject.toString());
                 return keyObject.get(name.getKey()).toString();
             } catch (IOException e) {
                 e.printStackTrace();
+                Timber.d("timber: IOEXception");
+
             } catch (JSONException e) {
-                throw new RuntimeException(e);
+                e.printStackTrace();
+                Timber.d("timber: JSONException");
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/fast_follow_asset_pack_01/build.gradle b/fast_follow_asset_pack_01/build.gradle
new file mode 100644
index 000000000..985509717
--- /dev/null
+++ b/fast_follow_asset_pack_01/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'com.android.asset-pack'
+
+assetPack {
+    packName = "fast_follow_asset_pack_01"
+    dynamicDelivery {
+        deliveryType = "fast-follow"
+    }
+}
\ No newline at end of file
diff --git a/install_time_asset_pack/build.gradle b/install_time_asset_pack/build.gradle
new file mode 100644
index 000000000..203141628
--- /dev/null
+++ b/install_time_asset_pack/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'com.android.asset-pack'
+
+assetPack {
+    packName = "install_time_asset_pack"
+    dynamicDelivery {
+        deliveryType = "install-time"
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 573abcb32..3c3efd1aa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
 include ':app'
-
+include ':install_time_asset_pack'
+include ':fast_follow_asset_pack_01'
\ No newline at end of file