Merge branch 'fix-otp-generation'

Author: animalillo

app/src/main/java/es/wolfi/app/passman/fragments/CredentialDisplayFragment.java

@@ -46,6 +46,8 @@
 import net.bierbaumer.otp_authenticator.TOTPHelper;
 
 import org.apache.commons.codec.binary.Base32;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -132,22 +134,28 @@ public void onCreate(Bundle savedInstanceState) {
 
         if (credential != null) {
             handler = new Handler();
-            if (credential.getOtp().length() > 4) {
-                otp_refresh = new Runnable() {
-                    @Override
-                    public void run() {
-                        int progress = (int) (System.currentTimeMillis() / 1000) % 30;
-                        otp_progress.setProgress(progress * 100);
-
-                        ObjectAnimator animation = ObjectAnimator.ofInt(otp_progress, "progress", (progress + 1) * 100);
-                        animation.setDuration(1000);
-                        animation.setInterpolator(new LinearInterpolator());
-                        animation.start();
-
-                        otp.setText(TOTPHelper.generate(new Base32().decode(credential.getOtp())));
-                        handler.postDelayed(this, 1000);
-                    }
-                };
+            try {
+                JSONObject otpObj = new JSONObject(credential.getOtp());
+                if (otpObj.has("secret") && otpObj.getString("secret").length() > 4) {
+                    String otpSecret = otpObj.getString("secret");
+                    otp_refresh = new Runnable() {
+                        @Override
+                        public void run() {
+                            int progress = (int) (System.currentTimeMillis() / 1000) % 30;
+                            otp_progress.setProgress(progress * 100);
+
+                            ObjectAnimator animation = ObjectAnimator.ofInt(otp_progress, "progress", (progress + 1) * 100);
+                            animation.setDuration(1000);
+                            animation.setInterpolator(new LinearInterpolator());
+                            animation.start();
+
+                            otp.setText(TOTPHelper.generate(new Base32().decode(otpSecret)));
+                            handler.postDelayed(this, 1000);
+                        }
+                    };
+                }
+            } catch (JSONException e) {
+                e.printStackTrace();
             }
         } else {
             Toast.makeText(getContext(), getString(R.string.error_occurred), Toast.LENGTH_LONG).show();

fastlane/metadata/android/en-US/changelogs/13.txt

@@ -1,4 +1,5 @@
 - fix ConcurrentModificationException after editing or deleting a credential
+- fix OTP generation
 - some other bug fixes
 - unify button position
 - replace char with character in translations