Merge pull request #130 from muun/51-release-branch

Apollo: Release source code for 51
muun · Jul 31, 2023 · 69bacfb · 69bacfb
2 parents 595d0c0 + 222bee0
commit 69bacfb
Show file tree

Hide file tree

Showing 66 changed files with 1,791 additions and 658 deletions.
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
@@ -6,6 +6,16 @@ follow [https://changelog.md/](https://changelog.md/) guidelines.
 
 ## [Unreleased]
 
+## [51] - 2023-07-28
+
+### ADDED
+
+- Support for requesting Push Notification Runtime Permission. Option to skip to receive on-chain
+but required to receive LN Payments (to avoid payment failures).
+
+### CHANGED
+- Upgraded compiledSdkVersion and targetSdkVersion to 33
+
 ## [50.16] - 2023-07-13
 
 ### FIXED

diff --git a/...o/src/main/java/io/muun/apollo/data/preferences/NotificationPermissionDeniedRepository.kt b/...o/src/main/java/io/muun/apollo/data/preferences/NotificationPermissionDeniedRepository.kt
@@ -0,0 +1,28 @@
+package io.muun.apollo.data.preferences
+
+import android.content.Context
+import io.muun.apollo.data.preferences.rx.Preference
+import javax.inject.Inject
+
+class NotificationPermissionDeniedRepository @Inject constructor(
+    context: Context,
+    repositoryRegistry: RepositoryRegistry,
+) : BaseRepository(context, repositoryRegistry) {
+
+    companion object {
+        private const val NOTIFICATION_PERMISSION_DENIED = "notification_permission_denied"
+    }
+
+    private val permissionDeniedPref: Preference<Boolean> = rxSharedPreferences
+        .getBoolean(NOTIFICATION_PERMISSION_DENIED)
+
+    override fun getFileName() =
+        "notification_permission_denied"
+
+    fun setHasPreviouslyDeniedNotificationPermission() {
+        permissionDeniedPref.set(true)
+    }
+
+    fun hasPreviouslyDeniedNotificationPermission(): Boolean =
+        permissionDeniedPref.get()!!
+}
diff --git a/.../src/main/java/io/muun/apollo/data/preferences/NotificationPermissionSkippedRepository.kt b/.../src/main/java/io/muun/apollo/data/preferences/NotificationPermissionSkippedRepository.kt
@@ -0,0 +1,28 @@
+package io.muun.apollo.data.preferences
+
+import android.content.Context
+import io.muun.apollo.data.preferences.rx.Preference
+import javax.inject.Inject
+
+class NotificationPermissionSkippedRepository @Inject constructor(
+    context: Context,
+    repositoryRegistry: RepositoryRegistry,
+) : BaseRepository(context, repositoryRegistry) {
+
+    companion object {
+        private const val NOTIFICATION_PERMISSION_SKIPPED = "notification_permission_skipped"
+    }
+
+    private val permissionSkippedPref: Preference<Boolean> = rxSharedPreferences
+        .getBoolean(NOTIFICATION_PERMISSION_SKIPPED)
+
+    override fun getFileName() =
+        "notification_permission_skipped"
+
+    fun store(permissionSkipped: Boolean) {
+        permissionSkippedPref.set(permissionSkipped)
+    }
+
+    fun get(): Boolean =
+        permissionSkippedPref.get()!!
+}
diff --git a/android/apollo/src/main/java/io/muun/apollo/data/preferences/RepositoryRegistry.kt b/android/apollo/src/main/java/io/muun/apollo/data/preferences/RepositoryRegistry.kt
@@ -1,5 +1,7 @@
 package io.muun.apollo.data.preferences
 
+import io.muun.apollo.data.preferences.permission.NotificationPermissionStateRepository
+
 /**
  * Welcome to RepositoryRegistry! This is class is meant to be a centralized, singleton registry
  * for all preferences repositories. Why do we need it? The idea is to invert the way of doing this
@@ -41,20 +43,27 @@ class RepositoryRegistry {
         FeaturesRepository::class.java,
         AppVersionRepository::class.java,
         PlayIntegrityNonceRepository::class.java,
+        NotificationPermissionStateRepository::class.java,
+        NotificationPermissionDeniedRepository::class.java,
+        NotificationPermissionSkippedRepository::class.java
     )
 
     // Notable exceptions:
     // - FirebaseInstallationIdRepository
     // - NightModeRepository
     // - SchemaVersionRepository
+    // - NotificationPermissionDeniedRepository
+    // - NotificationPermissionSkippedRepository
     // They get special treatment and are not wiped on logout to avoid problems.
     // Update: technically SchemaVersionRepository could be wiped with no issues, but we feel
     // its more clear and clean to keep it and avoid wiping it (there's no privacy or security
     // issues).
     private val logoutSurvivorRepositories: Set<Class<out BaseRepository>> = setOf(
         FirebaseInstallationIdRepository::class.java,
         NightModeRepository::class.java,
-        SchemaVersionRepository::class.java
+        SchemaVersionRepository::class.java,
+        NotificationPermissionDeniedRepository::class.java,
+        NotificationPermissionSkippedRepository::class.java
     )
 
     private val loadedRepositories: MutableSet<BaseRepository> = mutableSetOf()

diff --git a/android/apollo/src/main/java/io/muun/apollo/data/preferences/UserRepository.java b/android/apollo/src/main/java/io/muun/apollo/data/preferences/UserRepository.java
@@ -5,8 +5,8 @@
 import io.muun.apollo.data.preferences.stored.StoredEkVerificationCodes;
 import io.muun.apollo.data.serialization.SerializationUtils;
 import io.muun.apollo.domain.model.BitcoinUnit;
-import io.muun.apollo.domain.model.ContactsPermissionState;
 import io.muun.apollo.domain.model.EmergencyKitExport;
+import io.muun.apollo.domain.model.PermissionState;
 import io.muun.apollo.domain.model.user.EmergencyKit;
 import io.muun.apollo.domain.model.user.User;
 import io.muun.apollo.domain.model.user.UserPhoneNumber;
@@ -64,7 +64,7 @@ public class UserRepository extends BaseRepository {
 
     private final Preference<String> passwordChangeAuthorizedUuidPreference;
 
-    private final Preference<ContactsPermissionState> conctactsPermissionStatePreference;
+    private final Preference<PermissionState> conctactsPermissionStatePreference;
 
     private final Preference<Boolean> initialSyncCompletedPreference;
 
@@ -103,8 +103,8 @@ public UserRepository(Context context, RepositoryRegistry repositoryRegistry) {
 
         conctactsPermissionStatePreference = rxSharedPreferences.getEnum(
                 CONTACTS_PERMISSION_STATE_KEY,
-                ContactsPermissionState.DENIED,
-                ContactsPermissionState.class
+                PermissionState.DENIED,
+                PermissionState.class
         );
 
         initialSyncCompletedPreference = rxSharedPreferences.getBoolean(
@@ -308,18 +308,18 @@ public void authorizePasswordChange(String uuid) {
     /**
      * Save contacts permission state.
      */
-    public void storeContactsPermissionState(ContactsPermissionState state) {
+    public void storeContactsPermissionState(PermissionState state) {
         conctactsPermissionStatePreference.set(state);
     }
 
-    public ContactsPermissionState getContactsPermissionState() {
+    public PermissionState getContactsPermissionState() {
         return conctactsPermissionStatePreference.get();
     }
 
     /**
      * Get an Observable to observe changes to the contacts permission preference.
      */
-    public Observable<ContactsPermissionState> watchContactsPermissionState() {
+    public Observable<PermissionState> watchContactsPermissionState() {
         return conctactsPermissionStatePreference.asObservable();
     }
 

diff --git a/.../java/io/muun/apollo/data/preferences/permission/NotificationPermissionStateRepository.kt b/.../java/io/muun/apollo/data/preferences/permission/NotificationPermissionStateRepository.kt
@@ -0,0 +1,34 @@
+package io.muun.apollo.data.preferences.permission
+
+import android.content.Context
+import io.muun.apollo.data.preferences.BaseRepository
+import io.muun.apollo.data.preferences.RepositoryRegistry
+import io.muun.apollo.data.preferences.rx.Preference
+import io.muun.apollo.domain.model.PermissionState
+import javax.inject.Inject
+
+class NotificationPermissionStateRepository @Inject constructor(
+    context: Context,
+    repositoryRegistry: RepositoryRegistry,
+) : BaseRepository(context, repositoryRegistry) {
+
+    companion object {
+        private const val NOTIFICATION_PERMISSION_STATE = "notification_permission_state"
+    }
+
+    private val permissionStatePref: Preference<PermissionState> = rxSharedPreferences.getEnum(
+        NOTIFICATION_PERMISSION_STATE,
+        PermissionState.NOT_DETERMINED,
+        PermissionState::class.java
+    )
+
+    override fun getFileName() =
+        "notification_permission_state"
+
+    fun store(permissionState: PermissionState) {
+        permissionStatePref.set(permissionState)
+    }
+
+    fun get(): PermissionState =
+        permissionStatePref.get()!!
+}
diff --git a/android/apollo/src/main/java/io/muun/apollo/domain/action/UserActions.java b/android/apollo/src/main/java/io/muun/apollo/domain/action/UserActions.java
@@ -7,8 +7,8 @@
 import io.muun.apollo.domain.action.base.AsyncAction2;
 import io.muun.apollo.domain.action.base.AsyncActionStore;
 import io.muun.apollo.domain.action.user.UpdateProfilePictureAction;
-import io.muun.apollo.domain.model.ContactsPermissionState;
 import io.muun.apollo.domain.model.FeedbackCategory;
+import io.muun.apollo.domain.model.PermissionState;
 import io.muun.apollo.domain.model.user.User;
 import io.muun.apollo.domain.model.user.UserPhoneNumber;
 import io.muun.apollo.domain.model.user.UserProfile;
@@ -70,26 +70,26 @@ public UserActions(AsyncActionStore asyncActionStore,
         this.updateProfilePictureAction = updateProfilePictureAction;
 
         this.createPhoneAction = asyncActionStore
-            .get("user/createPhone", this::createPhone);
+                .get("user/createPhone", this::createPhone);
 
         this.resendVerificationCodeAction = asyncActionStore
-            .get("user/resendCode", houstonClient::resendVerificationCode);
+                .get("user/resendCode", houstonClient::resendVerificationCode);
 
         this.confirmPhoneAction = asyncActionStore
-            .get("user/confirm-phone", this::confirmPhone);
+                .get("user/confirm-phone", this::confirmPhone);
 
         this.createProfileAction = asyncActionStore
-            .get("user/createProfile", this::createProfile);
+                .get("user/createProfile", this::createProfile);
 
 
         this.updateUsernameAction = asyncActionStore
-            .get("user/editUsername", this::updateUsername);
+                .get("user/editUsername", this::updateUsername);
 
         this.updatePrimaryCurrencyAction = asyncActionStore
-            .get("user/editPrimaryCurrency", this::updatePrimaryCurrency);
+                .get("user/editPrimaryCurrency", this::updatePrimaryCurrency);
 
         this.submitFeedbackAction = asyncActionStore
-            .get("user/submitFeedbackAction", this::submitFeedback);
+                .get("user/submitFeedbackAction", this::submitFeedback);
 
         this.notifyLogoutAction = asyncActionStore.get(NOTIFY_LOGOUT_ACTION, this::notifyLogout);
     }
@@ -175,40 +175,7 @@ public void resetPhoneNumber() {
      * Save user's choice to never be asked again for Contacts permission.
      */
     public void reportContactsPermissionNeverAskAgain() {
-        userRepository.storeContactsPermissionState(ContactsPermissionState.PERMANENTLY_DENIED);
-    }
-
-    /**
-     * Update value of user preference tracking Contacts permission state.
-     * This receives as param the result of asking if permission is granted, that's why it is a
-     * boolean: true for GRANTED, false for DENIED.
-     *
-     * <p>Helpful: table of values
-     *
-     * <p>if current_state is GRANTED           && new_value is GRANTED =>  GRANTED
-     * if current_state is GRANTED              && new_value is DENIED  =>  DENIED
-     * if current_state is DENIED               && new_value is GRANTED =>  GRANTED
-     * if current_state is DENIED               && new_value is DENIED  =>  DENIED
-     * if current_state is PERMANENTLY_DENIED   && new_value is GRANTED =>  GRANTED
-     * if current_state is PERMANENTLY_DENIED   && new_value is DENIED  =>  PERMANENTLY_DENIED
-     */
-    public void updateContactsPermissionState(boolean granted) {
-
-        final ContactsPermissionState prevState = userRepository.getContactsPermissionState();
-
-        if (granted) {
-            // if we detect a permission grant (via android settings) => trigger sync phone contacts
-            if (isLoggedIn() && prevState != ContactsPermissionState.GRANTED) {
-                contactActions.initialSyncPhoneContactsAction.run();
-            }
-
-            userRepository.storeContactsPermissionState(ContactsPermissionState.GRANTED);
-            return;
-        }
-
-        if (prevState != ContactsPermissionState.PERMANENTLY_DENIED) {
-            userRepository.storeContactsPermissionState(ContactsPermissionState.DENIED);
-        }
+        userRepository.storeContactsPermissionState(PermissionState.PERMANENTLY_DENIED);
     }
 
     private Observable<Void> notifyLogout(String jwtToken) {

diff --git a/android/apollo/src/main/java/io/muun/apollo/domain/action/di/ActionComponent.java b/android/apollo/src/main/java/io/muun/apollo/domain/action/di/ActionComponent.java
@@ -26,6 +26,7 @@
 import io.muun.apollo.domain.action.operation.ResolveLnInvoiceAction;
 import io.muun.apollo.domain.action.operation.ResolveOperationUriAction;
 import io.muun.apollo.domain.action.operation.SubmitPaymentAction;
+import io.muun.apollo.domain.action.permission.UpdateContactsPermissionStateAction;
 import io.muun.apollo.domain.action.realtime.FetchRealTimeDataAction;
 import io.muun.apollo.domain.action.session.CreateLoginSessionAction;
 import io.muun.apollo.domain.action.session.LogInAction;
@@ -120,4 +121,6 @@ public interface ActionComponent {
     AddEmergencyKitMetadataAction addEmergencyKitMetadata();
 
     StartRecoveryCodeSetupAction startRecoveryCodeSetupAction();
+
+    UpdateContactsPermissionStateAction updateContactsPermissionStateAction();
 }
diff --git a/...n/java/io/muun/apollo/domain/action/notification/SetNotificationPermissionDeniedAction.kt b/...n/java/io/muun/apollo/domain/action/notification/SetNotificationPermissionDeniedAction.kt
@@ -0,0 +1,13 @@
+package io.muun.apollo.domain.action.notification
+
+import io.muun.apollo.data.preferences.NotificationPermissionDeniedRepository
+import javax.inject.Inject
+
+class SetNotificationPermissionDeniedAction @Inject constructor(
+    private val notificationPermissionDeniedRepository: NotificationPermissionDeniedRepository,
+) {
+
+    fun run() {
+        return notificationPermissionDeniedRepository.setHasPreviouslyDeniedNotificationPermission()
+    }
+}
diff --git a/.../java/io/muun/apollo/domain/action/notification/SetNotificationPermissionSkippedAction.kt b/.../java/io/muun/apollo/domain/action/notification/SetNotificationPermissionSkippedAction.kt
@@ -0,0 +1,13 @@
+package io.muun.apollo.domain.action.notification
+
+import io.muun.apollo.data.preferences.NotificationPermissionSkippedRepository
+import javax.inject.Inject
+
+class SetNotificationPermissionSkippedAction @Inject constructor(
+    private val notificationPermissionSkippedRepository: NotificationPermissionSkippedRepository,
+) {
+
+    fun run() {
+        return notificationPermissionSkippedRepository.store(true)
+    }
+}
diff --git a/...a/io/muun/apollo/domain/action/permission/SetNotificationPermissionNeverAskAgainAction.kt b/...a/io/muun/apollo/domain/action/permission/SetNotificationPermissionNeverAskAgainAction.kt
@@ -0,0 +1,14 @@
+package io.muun.apollo.domain.action.permission
+
+import io.muun.apollo.data.preferences.permission.NotificationPermissionStateRepository
+import io.muun.apollo.domain.model.PermissionState
+import javax.inject.Inject
+
+class SetNotificationPermissionNeverAskAgainAction @Inject constructor(
+    private val notificationPermissionStateRepository: NotificationPermissionStateRepository,
+) {
+
+    fun run() {
+        return notificationPermissionStateRepository.store(PermissionState.PERMANENTLY_DENIED)
+    }
+}