luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-24 07:46:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of https://github.com/alexbakker/Aegis

Browse source
This commit is contained in:
Michael Schättgen 2018-09-19 00:20:44 +02:00
commit 2d370bf885
3 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java
View file

@ -25,7 +25,6 @@ import me.impy.aegis.db.slots.SlotException;
import me.impy.aegis.helpers.FingerprintHelper; import me.impy.aegis.helpers.FingerprintHelper;
import me.impy.aegis.ui.dialogs.Dialogs; import me.impy.aegis.ui.dialogs.Dialogs;
import me.impy.aegis.ui.dialogs.FingerprintDialogFragment; import me.impy.aegis.ui.dialogs.FingerprintDialogFragment;
import me.impy.aegis.ui.dialogs.PasswordDialogFragment;
import me.impy.aegis.ui.views.SlotAdapter; import me.impy.aegis.ui.views.SlotAdapter;
import me.impy.aegis.ui.dialogs.SlotDialogFragment; import me.impy.aegis.ui.dialogs.SlotDialogFragment;
@ -51,11 +50,6 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
dialog.show(getSupportFragmentManager(), null); dialog.show(getSupportFragmentManager(), null);
}); });
findViewById(R.id.button_add_password).setOnClickListener(view -> {
PasswordDialogFragment dialog = new PasswordDialogFragment();
dialog.show(getSupportFragmentManager(), null);
});
// set up the recycler view // set up the recycler view
_adapter = new SlotAdapter(this); _adapter = new SlotAdapter(this);
RecyclerView slotsView = findViewById(R.id.list_slots); RecyclerView slotsView = findViewById(R.id.list_slots);
@ -78,11 +72,11 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
// only show the fingerprint option if we can get an instance of the fingerprint manager // only show the fingerprint option if we can get an instance of the fingerprint manager
// and if none of the slots in the collection has a matching alias in the keystore // and if none of the slots in the collection has a matching alias in the keystore
int visibility = View.VISIBLE; int visibility = View.VISIBLE;
if (FingerprintHelper.isSupported()) { if (FingerprintHelper.getManager(this) != null) {
try { try {
KeyStoreHandle keyStore = new KeyStoreHandle(); KeyStoreHandle keyStore = new KeyStoreHandle();
for (FingerprintSlot slot : _slots.findAll(FingerprintSlot.class)) { for (FingerprintSlot slot : _slots.findAll(FingerprintSlot.class)) {
if (keyStore.containsKey(slot.getUUID().toString()) && FingerprintHelper.getManager(this) != null) { if (keyStore.containsKey(slot.getUUID().toString())) {
visibility = View.GONE; visibility = View.GONE;
break; break;
} }

28
app/src/main/res/layout/activity_slots.xml
View file

@ -25,34 +25,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="vertical"/> android:scrollbars="vertical"/>
<LinearLayout
android:id="@+id/button_add_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="12.5dp"
android:paddingBottom="12.5dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_plus_black_24dp"
android:tint="@color/colorAccent"
android:layout_marginEnd="15dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add password"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/button_add_fingerprint" android:id="@+id/button_add_fingerprint"
android:layout_width="match_parent" android:layout_width="match_parent"

1
app/src/main/res/layout/fragment_authentication_slide.xml
View file

@ -25,7 +25,6 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:orientation="horizontal"> android:orientation="horizontal">
<RadioGroup <RadioGroup
android:id="@+id/rg_authenticationMethod" android:id="@+id/rg_authenticationMethod"
android:layout_width="match_parent" android:layout_width="match_parent"