commit 6519d3f40de09065915ae8df6a7ae48038065b54
author Loïc Siret <loic.siret@savoirfairelinux.com> Wed Aug 30 12:21:57 2017 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Thu Aug 31 15:00:27 2017 -0400
tree f9da19c4344f0eebd00c7b7238e440a175769abf
parent 386ca1ecb678f01fbf5d9a81932b452ebabdedc7

AndroidTV: optional password

Remove the hardcoded password for androidTV account, since the daemon
now support empty string to avoid encryption.
This patch needs a version of the daemon who supports no password
encryption.

Change-Id: I1a5acda1988d708ffb212b242ebb31a876fb3ac8

ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
index 71a3b93..9f3a361 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
@@ -73,8 +73,8 @@
         presenter.init(ringAccountViewModel);
 
         presenter.ringCheckChanged(false);
-        presenter.passwordChanged("password");
-        presenter.passwordConfirmChanged("password");
+        presenter.passwordChanged("");
+        presenter.passwordConfirmChanged("");
     }
 
     @Override

ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java

diff --git a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java
index 3deac5e..29c302f 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java
@@ -101,10 +101,7 @@
                 isConfirmCorrect = true;
             }
         }
-        if (password.isEmpty()) {
-            getView().showInvalidPasswordError(false);
-            isPasswordCorrect = false;
-        } else if (password.length() < PASSWORD_MIN_LENGTH) {
+        if (!password.isEmpty() && password.length() < PASSWORD_MIN_LENGTH) {
             getView().showInvalidPasswordError(true);
             isPasswordCorrect = false;
         } else {
@@ -116,10 +113,7 @@
     }
 
     public void passwordConfirmChanged(String passwordConfirm) {
-        if (passwordConfirm.isEmpty()) {
-            getView().showNonMatchingPasswordError(false);
-            isConfirmCorrect = false;
-        } else if (!passwordConfirm.equals(mRingAccountViewModel.getPassword())) {
+        if (!passwordConfirm.isEmpty() && !passwordConfirm.equals(mRingAccountViewModel.getPassword())) {
             getView().showNonMatchingPasswordError(true);
             isConfirmCorrect = false;
         } else {