Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ca5ef9c authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '146-fix_message_backup' into 'main' 

Fix messages not backing up

See merge request !59
parents c5c93c01 14f65bca

presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt

+11 −1
Original line number Diff line number Diff line
@@ -166,6 +166,16 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>( 
        backup.summary = state.lastBackup



        adapter.data = state.backups



        fabIcon.setImageResource(when (state.upgraded) {

            true -> R.drawable.ic_file_upload_black_24dp

            false -> R.drawable.ic_star_black_24dp

        })



        fabLabel.setText(when (state.upgraded) {

            true -> R.string.backup_now

            false -> R.string.title_qksms_plus

        })

    }



    override fun activityVisible(): Observable<*> = activityVisibleSubject

presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt

+20 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.moez.QKSMS.common.base.QkPresenter 
import com.moez.QKSMS.common.util.DateFormatter

import com.moez.QKSMS.common.util.extensions.makeToast

import com.moez.QKSMS.interactor.PerformBackup

import com.moez.QKSMS.manager.BillingManager

import com.moez.QKSMS.manager.PermissionManager

import com.moez.QKSMS.repository.BackupRepository

import com.uber.autodispose.android.lifecycle.scope
@@ -38,6 +39,7 @@ import javax.inject.Inject 


class BackupPresenter @Inject constructor(

    private val backupRepo: BackupRepository,

    private val billingManager: BillingManager,

    private val context: Context,

    private val dateFormatter: DateFormatter,

    private val navigator: Navigator,
@@ -71,6 +73,9 @@ class BackupPresenter @Inject constructor( 
                }

                .startWith(context.getString(R.string.backup_loading))

                .subscribe { lastBackup -> newState { copy(lastBackup = lastBackup) } }



        disposables += billingManager.upgradeStatus

                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }

    }



    override fun bindIntents(view: BackupView) {
@@ -84,9 +89,11 @@ class BackupPresenter @Inject constructor( 
        view.restoreClicks()

                .withLatestFrom(

                        backupRepo.getBackupProgress(),

                        backupRepo.getRestoreProgress())

                { _, backupProgress, restoreProgress ->

                        backupRepo.getRestoreProgress(),

                        billingManager.upgradeStatus)

                { _, backupProgress, restoreProgress, upgraded ->

                    when {

                        !upgraded -> context.makeToast(R.string.backup_restore_error_plus)

                        backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup)

                        restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore)

                        !permissionManager.hasStorage() -> view.requestStoragePermission()
@@ -113,6 +120,16 @@ class BackupPresenter @Inject constructor( 
                .autoDisposable(view.scope())

                .subscribe { backupRepo.stopRestore() }



        view.fabClicks()

                .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }

                .autoDisposable(view.scope())

                .subscribe { upgraded ->

                    when {

                        !upgraded -> navigator.showQksmsPlusActivity("backup_fab")

                        !permissionManager.hasStorage() -> view.requestStoragePermission()

                        upgraded -> performBackup.execute(Unit)

                    }

                }

    }



}