Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/passman-android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbinsky08 <timo@binsky.org>2022-08-27 04:04:15 +0300
committerbinsky08 <timo@binsky.org>2022-08-27 04:04:15 +0300
commit965553254f126aa573c33a0b80e23d81d3cf388c (patch)
tree6021731039d857c32bc455c46a3508f1f897ae59
parentee8ccd6ea1c6f1f683730d7df111d6637a709dd6 (diff)
QR code scan requires at least API 24
Signed-off-by: binsky08 <timo@binsky.org>
-rw-r--r--app/src/main/java/es/wolfi/app/passman/fragments/CredentialAddFragment.java5
-rw-r--r--app/src/main/java/es/wolfi/app/passman/fragments/CredentialEditFragment.java5
-rw-r--r--app/src/main/res/layout/content_otp_edit.xml2
3 files changed, 9 insertions, 3 deletions
diff --git a/app/src/main/java/es/wolfi/app/passman/fragments/CredentialAddFragment.java b/app/src/main/java/es/wolfi/app/passman/fragments/CredentialAddFragment.java
index 6b5dd93..315cea7 100644
--- a/app/src/main/java/es/wolfi/app/passman/fragments/CredentialAddFragment.java
+++ b/app/src/main/java/es/wolfi/app/passman/fragments/CredentialAddFragment.java
@@ -23,6 +23,7 @@ package es.wolfi.app.passman.fragments;
import android.app.ProgressDialog;
import android.content.Context;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -150,7 +151,9 @@ public class CredentialAddFragment extends Fragment implements View.OnClickListe
AppCompatImageButton scanOtpQRCodeButton = (AppCompatImageButton) view.findViewById(R.id.scanOtpQRCodeButton);
scanOtpQRCodeButton.setOnClickListener(this.getScanOtpQRCodeButtonListener());
- scanOtpQRCodeButton.setVisibility(View.VISIBLE);
+ if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+ scanOtpQRCodeButton.setVisibility(View.INVISIBLE);
+ }
otpEditCollapseExtendedButton = (AppCompatImageButton) view.findViewById(R.id.otpEditCollapseExtendedButton);
otpEditCollapseExtendedButton.setOnClickListener(this.getOtpEditCollapseExtendedButtonListener());
diff --git a/app/src/main/java/es/wolfi/app/passman/fragments/CredentialEditFragment.java b/app/src/main/java/es/wolfi/app/passman/fragments/CredentialEditFragment.java
index 92c78a8..8853914 100644
--- a/app/src/main/java/es/wolfi/app/passman/fragments/CredentialEditFragment.java
+++ b/app/src/main/java/es/wolfi/app/passman/fragments/CredentialEditFragment.java
@@ -25,6 +25,7 @@ import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -162,7 +163,9 @@ public class CredentialEditFragment extends Fragment implements View.OnClickList
AppCompatImageButton scanOtpQRCodeButton = (AppCompatImageButton) view.findViewById(R.id.scanOtpQRCodeButton);
scanOtpQRCodeButton.setOnClickListener(this.getScanOtpQRCodeButtonListener());
- scanOtpQRCodeButton.setVisibility(View.VISIBLE);
+ if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+ scanOtpQRCodeButton.setVisibility(View.INVISIBLE);
+ }
otpEditCollapseExtendedButton = (AppCompatImageButton) view.findViewById(R.id.otpEditCollapseExtendedButton);
otpEditCollapseExtendedButton.setOnClickListener(this.getOtpEditCollapseExtendedButtonListener());
diff --git a/app/src/main/res/layout/content_otp_edit.xml b/app/src/main/res/layout/content_otp_edit.xml
index 2931ad5..e4899ec 100644
--- a/app/src/main/res/layout/content_otp_edit.xml
+++ b/app/src/main/res/layout/content_otp_edit.xml
@@ -76,7 +76,7 @@
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical"
- android:visibility="visible">
+ android:visibility="gone">
<TextView
style="@style/Label"