litecoin-foundation
diff --git a/‎.gitignore
+22-4 b/‎.gitignore
+22-4
diff --git a/‎.idea/androidTestResultsUserPreferences.xml
+13 b/‎.idea/androidTestResultsUserPreferences.xml
+13
diff --git a/‎app/build.gradle
+9-9 b/‎app/build.gradle
+9-9
diff --git a/‎app/src/main/AndroidManifest.xml
+1 b/‎app/src/main/AndroidManifest.xml
+1
diff --git a/‎app/src/main/java/com/breadwallet/BreadApp.java
+22-39 b/‎app/src/main/java/com/breadwallet/BreadApp.java
+22-39
diff --git a/‎app/src/main/java/com/breadwallet/entities/IntroLanguage.kt
+5-3 b/‎app/src/main/java/com/breadwallet/entities/IntroLanguage.kt
+5-3
@@ -74,12 +74,30 @@ crash.txt
 /projectFilesBackup/
 /publishTODO.txt
 .idea/copyright/
-/app/google-services.json
-/app/partner-keys.json
-/app/src/main/assets/partner-keys.json
 /.idea/markdown-navigator/
 /app/src/main/java/com/breadwallet/presenter/fragments/FragmentBreadSignal.java
 /fastlane/
 fastlane/
+
+/.idea/appInsightsSettings.xml
+
+ ## Partner
+/app/partner-keys.json
+/app/src/main/assets/partner-keys.json
 partner-keys.json
-/.idea/appInsightsSettings.xml
+
+## Google Services
+app/src/litewallet/release/google-services.json 
+app/src/release/litewallet/google-services.json
+app/src/litewallet/google-services.json
+app/src/release/google-services.json 
+app/src/litewalletRelease/google-services.json 
+app/google-services.json
+
+app/src/litewallet/debug/google-services.json
+app/src/debug/litewallet/google-services.json
+app/src/litewallet/google-services.json
+app/src/debug/google-services.json
+app/src/litewalletDebug/google-services.json
+/app/release/google-services.json
+/app/debug/google-services.json
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-parcelize'
 
@@ -66,8 +65,8 @@ android {
         applicationId = 'com.loafwallet'
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 20240326
-        versionName "v2.9.1"
+        versionCode 20240424
+        versionName "v2.10.0"
         multiDexEnabled true
         archivesBaseName = "${versionName}(${versionCode})"
 
@@ -214,13 +213,13 @@ android {
     }
 
     buildTypes {
-//        gitUpdateModules()
-//        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
         release {
             signingConfig signingConfigs.release
-            minifyEnabled = false
+            minifyEnabled = true
             debuggable = false
+            //DEV: Mothballing gitUpdateModules() until time to resolve:
+            //gitUpdateModules()
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
             ndk {
                 minifyEnabled = false
@@ -318,7 +317,7 @@ dependencies {
 
     // push notifications
     implementation 'com.google.firebase:firebase-messaging:23.4.0'
-    implementation 'com.pusher:push-notifications-android:1.8.0'
+    implementation 'com.pusher:push-notifications-android:1.9.0'
 
     // Timber
     implementation 'com.jakewharton.timber:timber:4.7.1'
@@ -375,4 +374,5 @@ tasks.register("ktlintFormat", JavaExec) {
     jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
     // see https://pinterest.github.io/ktlint/install/cli/#command-line-usage for more information
     args "-F", "src/**/*.kt", "**.kts", "!**/build/**"
-}
+}
+apply plugin: 'com.google.gms.google-services'
@@ -56,6 +56,7 @@
             android:name=".presenter.activities.AnnounceUpdatesViewActivity"
             android:exported="false"
             android:label="Litewallet"
+            android:enableOnBackInvokedCallback="true"
             android:theme="@style/AppTheme" />
         <activity
             android:name=".presenter.activities.intro.IntroActivity"
 
@@ -3,14 +3,12 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Point;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
-
 import com.breadwallet.di.component.DaggerAppComponent;
 import com.breadwallet.presenter.activities.util.BRActivity;
 import com.breadwallet.presenter.entities.PartnerNames;
@@ -24,17 +22,9 @@
 import com.google.android.gms.common.GooglePlayServicesRepairableException;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.text.DateFormat;
 import java.util.ArrayList;
-import java.util.Currency;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -71,7 +61,14 @@ public void onCreate() {
         FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(enableCrashlytics);
         AnalyticsManager.init(this);
         AnalyticsManager.logCustomEvent(BRConstants._20191105_AL);
-        loadAdvertisingAndPush(this);
+
+        new Thread(() -> {
+            //fetch instance ID
+            String instanceID = Utils.fetchPartnerKey(this,
+                    PartnerNames.PUSHERSTAGING);
+            // setup Push Notifications
+            loadAdvertisingAndPush(instanceID, this);
+        }).start();
 
         WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
         Display display = wm.getDefaultDisplay();
@@ -80,12 +77,9 @@ public void onCreate() {
         DISPLAY_HEIGHT_PX = size.y;
         mFingerprintManager = (FingerprintManager) getSystemService(Context.FINGERPRINT_SERVICE);
     }
-
-
     public static Context getBreadContext() {
         return currentActivity == null ? SyncReceiver.app : currentActivity;
     }
-
     public static void setBreadContext(Activity app) {
         currentActivity = app;
     }
@@ -94,16 +88,13 @@ public static void fireListeners() {
         if (listeners == null) return;
         for (OnAppBackgrounded lis : listeners) lis.onBackgrounded();
     }
-
     public static void addOnBackgroundedListener(OnAppBackgrounded listener) {
         if (listeners == null) listeners = new ArrayList<>();
         if (!listeners.contains(listener)) listeners.add(listener);
     }
-
     public static boolean isAppInBackground(final Context context) {
         return context == null || activityCounter.get() <= 0;
     }
-
     //call onStop on evert activity so
     public static void onStop(final BRActivity app) {
         if (isBackgroundChecker != null) isBackgroundChecker.cancel();
@@ -123,23 +114,21 @@ public void run() {
 
         isBackgroundChecker.schedule(backgroundCheck, 500, 500);
     }
-
     @Override
     protected void attachBaseContext(Context base) {
         LocaleHelper.Companion.init(base);
         super.attachBaseContext(LocaleHelper.Companion.getInstance().setLocale(base));
     }
-
     public interface OnAppBackgrounded {
         void onBackgrounded();
     }
-    private void loadAdvertisingAndPush(Context app) {
-        Thread thr = new Thread(new Runnable() {
+    private void loadAdvertisingAndPush(String instanceID, Context app) {
+        new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
                     AdvertisingIdClient.Info adInfo = AdvertisingIdClient.getAdvertisingIdInfo(app);
-                    finished(adInfo);
+                    finishedLoadingPushService( instanceID, adInfo);
                 } catch (IllegalStateException e) {
                     e.printStackTrace();
                 } catch (GooglePlayServicesRepairableException e) {
@@ -149,35 +138,29 @@ public void run() {
                 } catch (GooglePlayServicesNotAvailableException e) {
                     e.printStackTrace();
                 }
-                finished(null);
+                String emptyID = "";
+                finishedLoadingPushService(emptyID,null);
+                Bundle params = new Bundle();
+                params.putString("pusher_instanceid_not_found",emptyID);
+                AnalyticsManager.logCustomEventWithParams(BRConstants._20200112_ERR, params);
             }
-        });
-        thr.start();
+        }).start();
     }
-
-    private void finished(final AdvertisingIdClient.Info adInfo) {
-        if(adInfo!=null) {
-
+    private void finishedLoadingPushService(final String instanceID, AdvertisingIdClient.Info adInfo) {
+        if(adInfo!=null && instanceID != "") {
+            // setup Pusher Interests
             String adInfoString = adInfo.getId();
             String generalAndroidInterest = "general-android";
             String debugGeneralAndroidInterest = "debug-general-android";
-            String pusherInstanceID = Utils.fetchPartnerKey(this, PartnerNames.PUSHERSTAGING);
 
-            // setup Push Notifications
-            //This worked had to add the iid dep https://github.com/mixpanel/mixpanel-android/issues/744
-            PushNotifications.start(getApplicationContext(), pusherInstanceID);
+            PushNotifications.start(getApplicationContext(), instanceID);
             PushNotifications.addDeviceInterest(generalAndroidInterest);
             PushNotifications.addDeviceInterest(debugGeneralAndroidInterest);
 
             //Send params for pusher setup
-            Bundle params = new Bundle();
-            params.putString("general-interest",generalAndroidInterest);
-            params.putString("debug-general-interest",debugGeneralAndroidInterest);
-            params.putString("device-ad-info",adInfoString);
-            AnalyticsManager.logCustomEventWithParams(BRConstants._20240123_RAGI, params);
+            AnalyticsManager.logCustomEvent(BRConstants._20240123_RAGI);
         }
     }
-
     private static class CrashReportingTree extends Timber.Tree {
         private static final String CRASHLYTICS_KEY_PRIORITY = "priority";
         private static final String CRASHLYTICS_KEY_TAG = "tag";
 
@@ -1,8 +1,10 @@
 package com.breadwallet.entities
 
 data class IntroLanguage(
-    val lang: String,
-    val desc: String,
-    val audio: Int,
+    val code: String,
+    val name : String,
+    val desc : String,
+    val audio : Int,
     val message: String,
+    val lang: Language
 )