ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved FetchOnFirstLogin dependency injection from BaseActivity to BaseSettingsActivity and CreateAccountActivity. 

MAILAND-1001
This commit is contained in:
Tomasz Giszczak 2020-11-02 14:26:50 +01:00
parent 417a77e8ae
commit e819a28c7e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ch/protonmail/android/activities/BaseActivity.java
View File

@ -77,7 +77,6 @@ import ch.protonmail.android.events.Status;
import ch.protonmail.android.jobs.organizations.GetOrganizationJob;
import ch.protonmail.android.jobs.payments.GetPaymentMethodsJob;
import ch.protonmail.android.settings.pin.ValidatePinActivity;
import ch.protonmail.android.usecase.fetch.FetchOnFirstLogin;
import ch.protonmail.android.utils.AppUtil;
import ch.protonmail.android.utils.CustomLocale;
import ch.protonmail.android.utils.INetworkConfiguratorCallback;
@ -129,8 +128,6 @@ public abstract class BaseActivity extends AppCompatActivity implements INetwork
protected FetchUserInfoWorker.Enqueuer fetchUserInfoWorkerEnqueuer;
@Inject
protected FetchMailSettingsWorker.Enqueuer fetchMailSettingsWorkerEnqueuer;
@Inject
protected FetchOnFirstLogin fetchOnFirstLogin;
@Nullable
@BindView(R.id.toolbar)

4
app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountActivity.java
View File

@ -76,6 +76,7 @@ import ch.protonmail.android.jobs.SendVerificationCodeJob;
import ch.protonmail.android.jobs.general.GetAvailableDomainsJob;
import ch.protonmail.android.jobs.payments.CreateSubscriptionJob;
import ch.protonmail.android.jobs.payments.VerifyPaymentJob;
import ch.protonmail.android.usecase.fetch.FetchOnFirstLogin;
import ch.protonmail.android.utils.AppUtil;
import ch.protonmail.android.utils.UiUtil;
import ch.protonmail.android.viewmodel.ConnectivityBaseViewModel;
@ -104,6 +105,9 @@ public class CreateAccountActivity extends BaseConnectivityActivity implements
@Inject
ConnectivityBaseViewModel viewModel;
@Inject
protected FetchOnFirstLogin fetchOnFirstLogin;
@BindView(R.id.fragmentContainer)
View fragmentContainer;
@BindView(R.id.progress_container)

4
app/src/main/java/ch/protonmail/android/activities/settings/BaseSettingsActivity.kt
View File

@ -77,6 +77,7 @@ import ch.protonmail.android.jobs.FetchByLocationJob
import ch.protonmail.android.servers.notification.CHANNEL_ID_EMAIL
import ch.protonmail.android.settings.pin.PinSettingsActivity
import ch.protonmail.android.uiModel.SettingsItemUiModel
import ch.protonmail.android.usecase.fetch.FetchOnFirstLogin
import ch.protonmail.android.utils.AppUtil
import ch.protonmail.android.utils.CustomLocale
import ch.protonmail.android.utils.PREF_CUSTOM_APP_LANGUAGE
@ -99,6 +100,9 @@ abstract class BaseSettingsActivity : BaseConnectivityActivity() {
@Inject
lateinit var viewModel: ConnectivityBaseViewModel
@Inject
lateinit var fetchOnFirstLogin: FetchOnFirstLogin
// region views
private val toolbar by lazy { findViewById<Toolbar>(R.id.toolbar) }
private val settingsRecyclerView by lazy { findViewById<RecyclerView>(R.id.settingsRecyclerView) }