From 2e1b341651f8bbde3fdb1c213267859309ee55f0 Mon Sep 17 00:00:00 2001
From: Amirhossein <amirhossein.naghshzan@savoirfairelinux.com>
Date: Wed, 19 May 2021 13:00:12 -0400
Subject: [PATCH] TVAccountExport: check if account has password
Change-Id: I9f95a4891beaa919b8cbf4c10c9fef854dc6fd35
---
.../cx/ring/tv/account/TVAccountExport.java | 17 +++++++++++++++--
.../main/java/cx/ring/tv/main/MainFragment.java | 4 ++--
.../java/cx/ring/tv/main/MainPresenter.java | 2 +-
.../src/main/java/cx/ring/tv/main/MainView.java | 2 +-
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
index 776ff9ae1..ad3821779 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
@@ -53,12 +53,16 @@ public class TVAccountExport extends JamiGuidedStepFragment<JamiAccountSummaryPr
implements JamiAccountSummaryView {
private static final long PASSWORD = 1L;
+ private static final long ACTION = 2L;
+
private ProgressDialog mWaitDialog;
private String mIdAccount;
+ private boolean mHasPassword;
- public static TVAccountExport createInstance(String idAccount) {
+ public static TVAccountExport createInstance(String idAccount, boolean hasPassword) {
TVAccountExport fragment = new TVAccountExport();
fragment.mIdAccount = idAccount;
+ fragment.mHasPassword = hasPassword;
return fragment;
}
@@ -82,7 +86,16 @@ public class TVAccountExport extends JamiGuidedStepFragment<JamiAccountSummaryPr
@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
- addPasswordAction(getActivity(), actions, PASSWORD, getString(R.string.account_enter_password), "", "");
+ if (mHasPassword) {
+ addPasswordAction(getActivity(), actions, PASSWORD, getString(R.string.account_enter_password), "", "");
+ } else {
+ addAction(getContext(), actions, ACTION, R.string.account_start_export_button);
+ }
+ }
+
+ @Override
+ public void onGuidedActionClicked(GuidedAction action) {
+ presenter.startAccountExport("");
}
@Override
diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java b/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java
index ef44df80a..edcb09ff9 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.java
@@ -418,8 +418,8 @@ public class MainFragment extends BaseBrowseFragment<MainPresenter> implements M
}
@Override
- public void showExportDialog(String pAccountID) {
- GuidedStepSupportFragment wizard = TVAccountExport.createInstance(pAccountID);
+ public void showExportDialog(String pAccountID, boolean hasPassword) {
+ GuidedStepSupportFragment wizard = TVAccountExport.createInstance(pAccountID, hasPassword);
GuidedStepSupportFragment.add(getParentFragmentManager(), wizard, R.id.main_browse_fragment);
}
diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java b/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java
index a4ce134b7..b42421a6c 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.java
@@ -113,7 +113,7 @@ public class MainPresenter extends RootPresenter<MainView> {
}
public void onExportClicked() {
- getView().showExportDialog(mAccountService.getCurrentAccount().getAccountID());
+ getView().showExportDialog(mAccountService.getCurrentAccount().getAccountID(), mAccountService.getCurrentAccount().hasPassword());
}
public void onLicenceClicked(int aboutType) {
diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java b/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java
index 519686f66..596f3e0d7 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/main/MainView.java
@@ -43,7 +43,7 @@ public interface MainView {
void displayAccountInfos(HomeNavigationViewModel viewModel);
void updateModel(Account account);
- void showExportDialog(String pAccountID);
+ void showExportDialog(String pAccountID, boolean hasPassword);
void showProfileEditing();
--
GitLab