2019-02-07 22:39:33 +01:00
|
|
|
package com.beemdevelopment.aegis.ui;
|
2017-12-27 22:04:22 +01:00
|
|
|
|
|
|
|
import android.content.Intent;
|
2018-12-11 11:44:36 +01:00
|
|
|
import android.content.res.Resources;
|
2018-06-06 21:26:09 +02:00
|
|
|
import android.graphics.Bitmap;
|
2018-06-06 22:22:38 +02:00
|
|
|
import android.graphics.drawable.BitmapDrawable;
|
|
|
|
import android.graphics.drawable.Drawable;
|
2020-05-24 13:43:59 +02:00
|
|
|
import android.net.Uri;
|
2017-12-27 22:04:22 +01:00
|
|
|
import android.os.Bundle;
|
|
|
|
import android.text.Editable;
|
|
|
|
import android.text.TextWatcher;
|
|
|
|
import android.view.Menu;
|
|
|
|
import android.view.MenuItem;
|
|
|
|
import android.view.View;
|
2018-04-05 00:07:48 +02:00
|
|
|
import android.view.animation.AccelerateInterpolator;
|
|
|
|
import android.view.animation.AlphaAnimation;
|
|
|
|
import android.view.animation.Animation;
|
2017-12-27 22:04:22 +01:00
|
|
|
import android.widget.AdapterView;
|
2021-01-17 13:12:43 +01:00
|
|
|
import android.widget.AutoCompleteTextView;
|
2017-12-27 22:04:22 +01:00
|
|
|
import android.widget.ImageView;
|
2018-04-05 00:07:48 +02:00
|
|
|
import android.widget.RelativeLayout;
|
2017-12-27 22:04:22 +01:00
|
|
|
|
2019-12-26 20:47:28 +01:00
|
|
|
import androidx.annotation.NonNull;
|
|
|
|
import androidx.annotation.Nullable;
|
|
|
|
import androidx.appcompat.app.ActionBar;
|
|
|
|
import androidx.appcompat.app.AlertDialog;
|
|
|
|
|
2018-01-02 21:50:07 +01:00
|
|
|
import com.amulyakhare.textdrawable.TextDrawable;
|
2018-06-06 21:26:09 +02:00
|
|
|
import com.avito.android.krop.KropView;
|
2019-04-04 14:07:36 +02:00
|
|
|
import com.beemdevelopment.aegis.R;
|
2019-02-07 22:39:33 +01:00
|
|
|
import com.beemdevelopment.aegis.encoding.Base32;
|
2019-12-26 20:47:28 +01:00
|
|
|
import com.beemdevelopment.aegis.encoding.EncodingException;
|
2021-01-17 13:12:43 +01:00
|
|
|
import com.beemdevelopment.aegis.helpers.DropdownHelper;
|
2021-01-24 14:20:29 +01:00
|
|
|
import com.beemdevelopment.aegis.helpers.EditTextHelper;
|
2019-02-07 22:39:33 +01:00
|
|
|
import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
|
2020-10-24 14:21:49 +02:00
|
|
|
import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
|
2019-02-07 22:39:33 +01:00
|
|
|
import com.beemdevelopment.aegis.otp.HotpInfo;
|
|
|
|
import com.beemdevelopment.aegis.otp.OtpInfo;
|
|
|
|
import com.beemdevelopment.aegis.otp.OtpInfoException;
|
2019-03-31 22:15:03 +02:00
|
|
|
import com.beemdevelopment.aegis.otp.SteamInfo;
|
2019-02-07 22:39:33 +01:00
|
|
|
import com.beemdevelopment.aegis.otp.TotpInfo;
|
2019-12-26 20:47:28 +01:00
|
|
|
import com.beemdevelopment.aegis.util.Cloner;
|
2020-05-02 18:51:33 +02:00
|
|
|
import com.beemdevelopment.aegis.vault.VaultEntry;
|
|
|
|
import com.beemdevelopment.aegis.vault.VaultManager;
|
2019-06-23 10:18:10 +02:00
|
|
|
import com.bumptech.glide.Glide;
|
|
|
|
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
|
|
|
import com.bumptech.glide.request.target.CustomTarget;
|
|
|
|
import com.bumptech.glide.request.transition.Transition;
|
2021-01-17 13:12:43 +01:00
|
|
|
import com.google.android.material.textfield.TextInputEditText;
|
|
|
|
import com.google.android.material.textfield.TextInputLayout;
|
2018-01-02 21:50:07 +01:00
|
|
|
|
2018-06-06 22:22:38 +02:00
|
|
|
import java.io.ByteArrayOutputStream;
|
2018-12-11 11:44:36 +01:00
|
|
|
import java.util.ArrayList;
|
2021-01-24 14:20:29 +01:00
|
|
|
import java.util.Collections;
|
2018-12-11 11:44:36 +01:00
|
|
|
import java.util.List;
|
|
|
|
import java.util.TreeSet;
|
2020-05-02 18:51:33 +02:00
|
|
|
import java.util.UUID;
|
2018-09-25 19:36:56 +02:00
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
2018-06-06 22:22:38 +02:00
|
|
|
|
2018-06-06 21:57:38 +02:00
|
|
|
import de.hdodenhof.circleimageview.CircleImageView;
|
2017-12-27 22:04:22 +01:00
|
|
|
|
2018-06-06 16:15:31 +02:00
|
|
|
public class EditEntryActivity extends AegisActivity {
|
2018-11-27 20:55:55 +01:00
|
|
|
private static final int PICK_IMAGE_REQUEST = 0;
|
|
|
|
|
2017-12-30 14:21:21 +01:00
|
|
|
private boolean _isNew = false;
|
2019-12-25 19:21:34 +01:00
|
|
|
private VaultEntry _origEntry;
|
2018-12-11 11:44:36 +01:00
|
|
|
private TreeSet<String> _groups;
|
2018-09-25 19:36:56 +02:00
|
|
|
private boolean _hasCustomIcon = false;
|
|
|
|
// keep track of icon changes separately as the generated jpeg's are not deterministic
|
|
|
|
private boolean _hasChangedIcon = false;
|
2020-05-24 13:43:59 +02:00
|
|
|
private boolean _isEditingIcon;
|
2018-06-06 21:57:38 +02:00
|
|
|
private CircleImageView _iconView;
|
|
|
|
private ImageView _saveImageButton;
|
2018-01-02 21:50:07 +01:00
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
private TextInputEditText _textName;
|
|
|
|
private TextInputEditText _textIssuer;
|
|
|
|
private TextInputEditText _textPeriodCounter;
|
|
|
|
private TextInputLayout _textPeriodCounterLayout;
|
|
|
|
private TextInputEditText _textDigits;
|
|
|
|
private TextInputEditText _textSecret;
|
2017-12-27 22:04:22 +01:00
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
private AutoCompleteTextView _dropdownType;
|
|
|
|
private AutoCompleteTextView _dropdownAlgo;
|
|
|
|
private AutoCompleteTextView _dropdownGroup;
|
|
|
|
private List<String> _dropdownGroupList = new ArrayList<>();
|
2017-12-27 22:04:22 +01:00
|
|
|
|
2018-06-06 21:26:09 +02:00
|
|
|
private KropView _kropView;
|
|
|
|
|
2018-04-10 13:35:35 +02:00
|
|
|
private RelativeLayout _advancedSettingsHeader;
|
|
|
|
private RelativeLayout _advancedSettings;
|
|
|
|
|
2020-05-02 18:51:33 +02:00
|
|
|
private VaultManager _vault;
|
|
|
|
|
2017-12-27 22:04:22 +01:00
|
|
|
@Override
|
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
|
|
super.onCreate(savedInstanceState);
|
2018-06-06 16:15:31 +02:00
|
|
|
setContentView(R.layout.activity_edit_entry);
|
2021-01-17 13:12:43 +01:00
|
|
|
setSupportActionBar(findViewById(R.id.toolbar));
|
2017-12-27 22:04:22 +01:00
|
|
|
|
2020-05-02 18:51:33 +02:00
|
|
|
_vault = getApp().getVaultManager();
|
|
|
|
_groups = _vault.getGroups();
|
|
|
|
|
2017-12-27 22:04:22 +01:00
|
|
|
ActionBar bar = getSupportActionBar();
|
|
|
|
bar.setHomeAsUpIndicator(R.drawable.ic_close);
|
|
|
|
bar.setDisplayHomeAsUpEnabled(true);
|
|
|
|
|
2018-06-06 16:15:31 +02:00
|
|
|
// retrieve info from the calling activity
|
2018-01-02 21:50:07 +01:00
|
|
|
Intent intent = getIntent();
|
2020-05-02 18:51:33 +02:00
|
|
|
UUID entryUUID = (UUID) intent.getSerializableExtra("entryUUID");
|
|
|
|
if (entryUUID != null) {
|
|
|
|
_origEntry = _vault.getEntryByUUID(entryUUID);
|
|
|
|
} else {
|
|
|
|
_origEntry = (VaultEntry) intent.getSerializableExtra("newEntry");
|
|
|
|
_isNew = true;
|
2020-04-11 14:37:28 +02:00
|
|
|
setTitle(R.string.add_new_entry);
|
2017-12-30 00:26:16 +01:00
|
|
|
}
|
|
|
|
|
2019-08-31 13:46:18 +02:00
|
|
|
String selectedGroup = intent.getStringExtra("selectedGroup");
|
|
|
|
|
2018-06-06 16:15:31 +02:00
|
|
|
// set up fields
|
2018-01-02 21:50:07 +01:00
|
|
|
_iconView = findViewById(R.id.profile_drawable);
|
2018-06-06 21:26:09 +02:00
|
|
|
_kropView = findViewById(R.id.krop_view);
|
2018-06-06 21:57:38 +02:00
|
|
|
_saveImageButton = findViewById(R.id.iv_saveImage);
|
2017-12-30 00:26:16 +01:00
|
|
|
_textName = findViewById(R.id.text_name);
|
|
|
|
_textIssuer = findViewById(R.id.text_issuer);
|
2021-01-17 13:12:43 +01:00
|
|
|
_textPeriodCounter = findViewById(R.id.text_period_counter);
|
|
|
|
_textPeriodCounterLayout = findViewById(R.id.text_period_counter_layout);
|
2019-03-25 19:34:57 +01:00
|
|
|
_textDigits = findViewById(R.id.text_digits);
|
2017-12-30 00:26:16 +01:00
|
|
|
_textSecret = findViewById(R.id.text_secret);
|
2021-01-17 13:12:43 +01:00
|
|
|
_dropdownType = findViewById(R.id.dropdown_type);
|
|
|
|
DropdownHelper.fillDropdown(this, _dropdownType, R.array.otp_types_array);
|
|
|
|
_dropdownAlgo = findViewById(R.id.dropdown_algo);
|
|
|
|
DropdownHelper.fillDropdown(this, _dropdownAlgo, R.array.otp_algo_array);
|
|
|
|
_dropdownGroup = findViewById(R.id.dropdown_group);
|
|
|
|
updateGroupDropdownList();
|
|
|
|
DropdownHelper.fillDropdown(this, _dropdownGroup, _dropdownGroupList);
|
2018-06-09 20:23:39 +02:00
|
|
|
|
2018-04-10 13:35:35 +02:00
|
|
|
_advancedSettingsHeader = findViewById(R.id.accordian_header);
|
|
|
|
_advancedSettings = findViewById(R.id.expandableLayout);
|
|
|
|
|
2018-06-06 16:15:31 +02:00
|
|
|
// fill the fields with values if possible
|
2019-09-04 21:42:01 +02:00
|
|
|
if (_origEntry.hasIcon()) {
|
|
|
|
Glide.with(this)
|
|
|
|
.asDrawable()
|
|
|
|
.load(_origEntry)
|
|
|
|
.diskCacheStrategy(DiskCacheStrategy.NONE)
|
|
|
|
.skipMemoryCache(false)
|
|
|
|
.into(_iconView);
|
|
|
|
_hasCustomIcon = true;
|
|
|
|
} else {
|
|
|
|
TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
|
|
|
|
_iconView.setImageDrawable(drawable);
|
|
|
|
}
|
2018-06-06 16:15:31 +02:00
|
|
|
|
2019-09-04 21:42:01 +02:00
|
|
|
_textName.setText(_origEntry.getName());
|
|
|
|
_textIssuer.setText(_origEntry.getIssuer());
|
2018-06-06 16:15:31 +02:00
|
|
|
|
2019-09-04 21:42:01 +02:00
|
|
|
OtpInfo info = _origEntry.getInfo();
|
|
|
|
if (info instanceof TotpInfo) {
|
2021-01-17 13:12:43 +01:00
|
|
|
_textPeriodCounterLayout.setHint(R.string.period_hint);
|
|
|
|
_textPeriodCounter.setText(Integer.toString(((TotpInfo) info).getPeriod()));
|
2019-09-04 21:42:01 +02:00
|
|
|
} else if (info instanceof HotpInfo) {
|
2021-01-17 13:12:43 +01:00
|
|
|
_textPeriodCounterLayout.setHint(R.string.counter);
|
|
|
|
_textPeriodCounter.setText(Long.toString(((HotpInfo) info).getCounter()));
|
2019-09-04 21:42:01 +02:00
|
|
|
} else {
|
2020-05-02 18:51:12 +02:00
|
|
|
throw new RuntimeException(String.format("Unsupported OtpInfo type: %s", info.getClass()));
|
2019-09-04 21:42:01 +02:00
|
|
|
}
|
|
|
|
_textDigits.setText(Integer.toString(info.getDigits()));
|
|
|
|
|
|
|
|
byte[] secretBytes = _origEntry.getInfo().getSecret();
|
|
|
|
if (secretBytes != null) {
|
2019-12-26 20:47:28 +01:00
|
|
|
String secretString = Base32.encode(secretBytes);
|
|
|
|
_textSecret.setText(secretString);
|
2019-09-04 21:42:01 +02:00
|
|
|
}
|
2017-12-30 00:26:16 +01:00
|
|
|
|
2021-01-24 12:53:29 +01:00
|
|
|
_dropdownType.setText(_origEntry.getInfo().getTypeId().toUpperCase(), false);
|
2021-01-17 13:12:43 +01:00
|
|
|
_dropdownAlgo.setText(_origEntry.getInfo().getAlgorithm(false), false);
|
2018-06-06 16:15:31 +02:00
|
|
|
|
2019-09-04 21:42:01 +02:00
|
|
|
String group = _origEntry.getGroup();
|
|
|
|
setGroup(group);
|
2018-06-06 16:15:31 +02:00
|
|
|
|
2018-01-02 21:50:07 +01:00
|
|
|
// update the icon if the text changed
|
2018-06-06 16:27:56 +02:00
|
|
|
_textIssuer.addTextChangedListener(_iconChangeListener);
|
|
|
|
_textName.addTextChangedListener(_iconChangeListener);
|
2018-04-05 00:07:48 +02:00
|
|
|
|
2018-06-06 16:15:31 +02:00
|
|
|
// show/hide period and counter fields on type change
|
2021-01-17 13:12:43 +01:00
|
|
|
_dropdownType.setOnItemClickListener((parent, view, position, id) -> {
|
|
|
|
String type = _dropdownType.getText().toString().toLowerCase();
|
|
|
|
switch (type) {
|
|
|
|
case TotpInfo.ID:
|
|
|
|
case SteamInfo.ID:
|
|
|
|
_textPeriodCounterLayout.setHint(R.string.period_hint);
|
|
|
|
_textPeriodCounter.setText(String.format("%d", 30));
|
|
|
|
break;
|
|
|
|
case HotpInfo.ID:
|
|
|
|
_textPeriodCounterLayout.setHint(R.string.counter);
|
|
|
|
_textPeriodCounter.setText(String.format("%d", 0));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
throw new RuntimeException(String.format("Unsupported OTP type: %s", type));
|
2018-06-06 16:15:31 +02:00
|
|
|
}
|
2021-01-17 13:12:43 +01:00
|
|
|
});
|
2018-06-06 16:15:31 +02:00
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
_iconView.setOnClickListener(v -> {
|
|
|
|
startIconSelectionActivity();
|
2018-06-06 16:15:31 +02:00
|
|
|
});
|
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
_advancedSettingsHeader.setOnClickListener(v -> openAdvancedSettings());
|
|
|
|
|
|
|
|
// automatically open advanced settings since 'Secret' is required.
|
|
|
|
if (_isNew) {
|
|
|
|
openAdvancedSettings();
|
|
|
|
setGroup(selectedGroup);
|
|
|
|
}
|
|
|
|
|
|
|
|
_dropdownGroup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
|
|
private int prevPosition = _dropdownGroupList.indexOf(_dropdownGroup.getText().toString());
|
2018-12-11 11:44:36 +01:00
|
|
|
|
|
|
|
@Override
|
2021-01-17 13:12:43 +01:00
|
|
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
|
|
|
if (position == _dropdownGroupList.size() - 1) {
|
|
|
|
Dialogs.showTextInputDialog(EditEntryActivity.this, R.string.set_group, R.string.group_name_hint, text -> {
|
2019-04-24 18:59:09 +02:00
|
|
|
String str = new String(text);
|
|
|
|
if (str.isEmpty()) {
|
2018-12-16 22:25:50 +01:00
|
|
|
return;
|
2018-12-11 11:44:36 +01:00
|
|
|
}
|
2019-04-24 18:59:09 +02:00
|
|
|
_groups.add(str);
|
2021-01-17 13:12:43 +01:00
|
|
|
updateGroupDropdownList();
|
|
|
|
_dropdownGroup.setText(_dropdownGroupList.get(position), false);
|
2018-12-11 11:44:36 +01:00
|
|
|
});
|
2021-01-17 13:12:43 +01:00
|
|
|
_dropdownGroup.setText(_dropdownGroupList.get(prevPosition), false);
|
2018-12-11 11:44:36 +01:00
|
|
|
} else {
|
|
|
|
prevPosition = position;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
2017-12-30 00:26:16 +01:00
|
|
|
}
|
|
|
|
|
2019-08-31 13:46:18 +02:00
|
|
|
private void setGroup(String groupName) {
|
2021-01-17 13:12:43 +01:00
|
|
|
int pos = 0;
|
|
|
|
if (groupName != null) {
|
|
|
|
pos = _groups.contains(groupName) ? _groups.headSet(groupName).size() + 1 : 0;
|
2019-08-31 13:46:18 +02:00
|
|
|
}
|
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
_dropdownGroup.setText(_dropdownGroupList.get(pos), false);
|
2019-08-31 13:46:18 +02:00
|
|
|
}
|
2020-05-02 18:51:33 +02:00
|
|
|
|
2018-05-11 15:12:36 +02:00
|
|
|
private void openAdvancedSettings() {
|
2018-09-25 19:36:56 +02:00
|
|
|
Animation fadeOut = new AlphaAnimation(1, 0);
|
2018-04-10 13:35:35 +02:00
|
|
|
fadeOut.setInterpolator(new AccelerateInterpolator());
|
2018-09-25 19:36:56 +02:00
|
|
|
fadeOut.setDuration(220);
|
2018-04-10 13:35:35 +02:00
|
|
|
_advancedSettingsHeader.startAnimation(fadeOut);
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
Animation fadeIn = new AlphaAnimation(0, 1);
|
2018-04-10 13:35:35 +02:00
|
|
|
fadeIn.setInterpolator(new AccelerateInterpolator());
|
2018-09-25 19:36:56 +02:00
|
|
|
fadeIn.setDuration(250);
|
2018-04-10 13:35:35 +02:00
|
|
|
|
|
|
|
fadeOut.setAnimationListener(new Animation.AnimationListener() {
|
|
|
|
@Override
|
|
|
|
public void onAnimationStart(Animation animation) {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onAnimationEnd(Animation animation) {
|
|
|
|
_advancedSettingsHeader.setVisibility(View.GONE);
|
|
|
|
_advancedSettings.startAnimation(fadeIn);
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onAnimationRepeat(Animation animation) {
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
fadeIn.setAnimationListener(new Animation.AnimationListener() {
|
|
|
|
@Override
|
|
|
|
public void onAnimationStart(Animation animation) {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onAnimationEnd(Animation animation) {
|
|
|
|
_advancedSettings.setVisibility(View.VISIBLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onAnimationRepeat(Animation animation) {
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
private void updateGroupDropdownList() {
|
2018-12-11 11:44:36 +01:00
|
|
|
Resources res = getResources();
|
2021-01-17 13:12:43 +01:00
|
|
|
_dropdownGroupList.clear();
|
|
|
|
_dropdownGroupList.add(res.getString(R.string.no_group));
|
|
|
|
_dropdownGroupList.addAll(_groups);
|
|
|
|
_dropdownGroupList.add(res.getString(R.string.new_group));
|
2018-12-11 11:44:36 +01:00
|
|
|
}
|
|
|
|
|
2017-12-27 22:04:22 +01:00
|
|
|
@Override
|
|
|
|
public void onBackPressed() {
|
2020-05-24 13:43:59 +02:00
|
|
|
if (_isEditingIcon) {
|
|
|
|
stopEditingIcon(false);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
AtomicReference<String> msg = new AtomicReference<>();
|
2019-12-25 19:21:34 +01:00
|
|
|
AtomicReference<VaultEntry> entry = new AtomicReference<>();
|
2018-09-25 19:36:56 +02:00
|
|
|
|
|
|
|
try {
|
|
|
|
entry.set(parseEntry());
|
|
|
|
} catch (ParseException e) {
|
|
|
|
msg.set(e.getMessage());
|
|
|
|
}
|
|
|
|
|
|
|
|
// close the activity if the entry has not been changed
|
2019-09-04 21:42:01 +02:00
|
|
|
if (!_hasChangedIcon && _origEntry.equals(entry.get())) {
|
2017-12-27 22:04:22 +01:00
|
|
|
super.onBackPressed();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
// ask for confirmation if the entry has been changed
|
2018-05-14 21:02:35 +02:00
|
|
|
Dialogs.showDiscardDialog(this,
|
2018-09-25 19:36:56 +02:00
|
|
|
(dialog, which) -> {
|
|
|
|
// if the entry couldn't be parsed, we show an error dialog
|
|
|
|
if (msg.get() != null) {
|
|
|
|
onSaveError(msg.get());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-05-02 18:51:33 +02:00
|
|
|
addAndFinish(entry.get());
|
2018-09-25 19:36:56 +02:00
|
|
|
},
|
2018-05-14 21:02:35 +02:00
|
|
|
(dialog, which) -> super.onBackPressed()
|
|
|
|
);
|
2017-12-27 22:04:22 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean onOptionsItemSelected(MenuItem item) {
|
|
|
|
switch (item.getItemId()) {
|
|
|
|
case android.R.id.home:
|
|
|
|
onBackPressed();
|
2018-05-10 23:11:21 +02:00
|
|
|
break;
|
2017-12-27 22:04:22 +01:00
|
|
|
case R.id.action_save:
|
2018-05-10 23:11:21 +02:00
|
|
|
onSave();
|
|
|
|
break;
|
2017-12-27 22:04:22 +01:00
|
|
|
case R.id.action_delete:
|
2021-01-24 14:20:29 +01:00
|
|
|
Dialogs.showDeleteEntriesDialog(this, Collections.singletonList(_origEntry.getIssuer()), (dialog, which) -> {
|
2020-05-02 18:51:33 +02:00
|
|
|
deleteAndFinish(_origEntry);
|
2018-05-10 23:11:21 +02:00
|
|
|
});
|
|
|
|
break;
|
2020-05-24 13:43:59 +02:00
|
|
|
case R.id.action_edit_icon:
|
|
|
|
startIconSelectionActivity();
|
|
|
|
break;
|
2018-06-09 21:40:18 +02:00
|
|
|
case R.id.action_default_icon:
|
2018-09-25 19:36:56 +02:00
|
|
|
TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
|
2018-06-07 12:27:42 +02:00
|
|
|
_iconView.setImageDrawable(drawable);
|
2018-09-25 19:36:56 +02:00
|
|
|
_hasCustomIcon = false;
|
|
|
|
_hasChangedIcon = true;
|
2017-12-27 22:04:22 +01:00
|
|
|
default:
|
|
|
|
return super.onOptionsItemSelected(item);
|
|
|
|
}
|
2018-05-10 23:11:21 +02:00
|
|
|
|
|
|
|
return true;
|
2017-12-27 22:04:22 +01:00
|
|
|
}
|
|
|
|
|
2020-05-24 13:43:59 +02:00
|
|
|
private void startIconSelectionActivity() {
|
|
|
|
Intent galleryIntent = new Intent(Intent.ACTION_PICK);
|
|
|
|
galleryIntent.setDataAndType(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, "image/*");
|
|
|
|
|
2020-07-15 12:53:16 +02:00
|
|
|
Intent fileIntent = new Intent(Intent.ACTION_GET_CONTENT);
|
|
|
|
fileIntent.setType("image/*");
|
|
|
|
|
2020-05-24 13:43:59 +02:00
|
|
|
Intent chooserIntent = Intent.createChooser(galleryIntent, getString(R.string.select_icon));
|
2020-07-15 12:53:16 +02:00
|
|
|
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { fileIntent });
|
|
|
|
startActivityForResult(chooserIntent, PICK_IMAGE_REQUEST);
|
2020-05-24 13:43:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private void startEditingIcon(Uri data) {
|
|
|
|
Glide.with(this)
|
|
|
|
.asBitmap()
|
|
|
|
.load(data)
|
|
|
|
.diskCacheStrategy(DiskCacheStrategy.NONE)
|
|
|
|
.skipMemoryCache(false)
|
|
|
|
.into(new CustomTarget<Bitmap>() {
|
|
|
|
@Override
|
|
|
|
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
|
|
|
|
_kropView.setBitmap(resource);
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onLoadCleared(@Nullable Drawable placeholder) {
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
_iconView.setVisibility(View.GONE);
|
|
|
|
_kropView.setVisibility(View.VISIBLE);
|
|
|
|
|
|
|
|
_saveImageButton.setOnClickListener(v -> {
|
|
|
|
stopEditingIcon(true);
|
|
|
|
});
|
|
|
|
|
|
|
|
_isEditingIcon = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
private void stopEditingIcon(boolean save) {
|
|
|
|
if (save) {
|
|
|
|
_iconView.setImageBitmap(_kropView.getCroppedBitmap());
|
|
|
|
}
|
|
|
|
_iconView.setVisibility(View.VISIBLE);
|
|
|
|
_kropView.setVisibility(View.GONE);
|
|
|
|
_hasCustomIcon = _hasCustomIcon || save;
|
|
|
|
_hasChangedIcon = save;
|
|
|
|
_isEditingIcon = false;
|
|
|
|
}
|
|
|
|
|
2017-12-27 22:04:22 +01:00
|
|
|
@Override
|
|
|
|
public boolean onCreateOptionsMenu(Menu menu) {
|
|
|
|
getMenuInflater().inflate(R.menu.menu_edit, menu);
|
2017-12-30 14:21:21 +01:00
|
|
|
if (_isNew) {
|
|
|
|
menu.findItem(R.id.action_delete).setVisible(false);
|
|
|
|
}
|
2018-09-25 19:36:56 +02:00
|
|
|
if (!_hasCustomIcon) {
|
2018-06-09 21:40:18 +02:00
|
|
|
menu.findItem(R.id.action_default_icon).setVisible(false);
|
2018-06-07 00:30:49 +02:00
|
|
|
}
|
|
|
|
|
2017-12-27 22:04:22 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-05-02 18:51:33 +02:00
|
|
|
private void addAndFinish(VaultEntry entry) {
|
2020-08-15 18:32:14 +02:00
|
|
|
// It's possible that the new entry was already added to the vault, but writing the
|
|
|
|
// vault to disk failed, causing the user to tap 'Save' again. Calling addEntry
|
|
|
|
// again would cause a crash in that case, so the isEntryDuplicate check prevents
|
|
|
|
// that.
|
|
|
|
if (_isNew && !_vault.isEntryDuplicate(entry)) {
|
2020-05-02 18:51:33 +02:00
|
|
|
_vault.addEntry(entry);
|
|
|
|
} else {
|
|
|
|
_vault.replaceEntry(entry);
|
|
|
|
}
|
|
|
|
|
|
|
|
saveAndFinish(entry, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void deleteAndFinish(VaultEntry entry) {
|
|
|
|
_vault.removeEntry(entry);
|
|
|
|
saveAndFinish(entry, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void saveAndFinish(VaultEntry entry, boolean delete) {
|
2018-01-01 22:53:10 +01:00
|
|
|
Intent intent = new Intent();
|
2020-05-02 18:51:33 +02:00
|
|
|
intent.putExtra("entryUUID", entry.getUUID());
|
2018-01-01 22:53:10 +01:00
|
|
|
intent.putExtra("delete", delete);
|
2020-05-02 18:51:33 +02:00
|
|
|
|
2020-06-13 12:45:02 +02:00
|
|
|
if (saveVault(true)) {
|
2020-05-02 18:51:33 +02:00
|
|
|
setResult(RESULT_OK, intent);
|
|
|
|
finish();
|
|
|
|
}
|
2018-01-01 22:53:10 +01:00
|
|
|
}
|
Introduce UUIDMap for storing objects that are keyed by a UUID
This patch introduces the new ``UUIDMap`` type, reducing code duplication and
making UUID lookups faster. We currently already use UUIDs as the identifier for
the ``DatabaseEntry`` and ``Slot`` types, but the way lookups by UUID work are
kind of ugly, as we simply iterate over the list until we find a match. As we're
probably going to have more types like this soon (groups and icons, for
example), I figured it'd be good to abstract this away into a separate type and
make it a map instead of a list.
The only thing that has gotten slower is the ``swap`` method. The internal
``LinkedHashMap`` retains insertion order with a linked list, but does not know
about the position of the values, so we basically have to copy the entire map to
simply swap two values. I don't think it's too big of a deal, because swap
operations still take less than a millisecond even with large vaults, but
suggestions for improving this are welcome.
I had to update gradle and JUnit to be able to use the new ``assertThrows``
assertion method, so this patch includes that as well.
2019-06-10 18:25:44 +02:00
|
|
|
|
2018-06-06 21:26:09 +02:00
|
|
|
@Override
|
|
|
|
protected void onActivityResult(int requestCode, final int resultCode, Intent data) {
|
2018-11-27 20:55:55 +01:00
|
|
|
if (requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data != null && data.getData() != null) {
|
2020-05-24 13:43:59 +02:00
|
|
|
startEditingIcon(data.getData());
|
2018-06-06 21:26:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
|
}
|
|
|
|
|
2019-03-31 22:15:03 +02:00
|
|
|
private int parsePeriod() throws ParseException {
|
|
|
|
try {
|
2021-01-17 13:12:43 +01:00
|
|
|
return Integer.parseInt(_textPeriodCounter.getText().toString());
|
2019-03-31 22:15:03 +02:00
|
|
|
} catch (NumberFormatException e) {
|
|
|
|
throw new ParseException("Period is not an integer.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-25 19:21:34 +01:00
|
|
|
private VaultEntry parseEntry() throws ParseException {
|
2018-01-01 22:14:11 +01:00
|
|
|
if (_textSecret.length() == 0) {
|
2018-09-25 19:36:56 +02:00
|
|
|
throw new ParseException("Secret is a required field.");
|
2018-01-01 22:14:11 +01:00
|
|
|
}
|
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
String type = _dropdownType.getText().toString();
|
|
|
|
String algo = _dropdownAlgo.getText().toString();
|
2017-12-27 22:04:22 +01:00
|
|
|
|
|
|
|
int digits;
|
|
|
|
try {
|
2019-03-25 19:34:57 +01:00
|
|
|
digits = Integer.parseInt(_textDigits.getText().toString());
|
2017-12-27 22:04:22 +01:00
|
|
|
} catch (NumberFormatException e) {
|
2018-09-25 19:36:56 +02:00
|
|
|
throw new ParseException("Digits is not an integer.");
|
2017-12-27 22:04:22 +01:00
|
|
|
}
|
|
|
|
|
2018-06-06 16:15:31 +02:00
|
|
|
byte[] secret;
|
|
|
|
try {
|
2020-10-24 14:21:49 +02:00
|
|
|
String secretString = new String(EditTextHelper.getEditTextChars(_textSecret));
|
|
|
|
secret = GoogleAuthInfo.parseSecret(secretString);
|
2019-12-26 20:47:28 +01:00
|
|
|
if (secret.length == 0) {
|
|
|
|
throw new ParseException("Secret cannot be empty");
|
|
|
|
}
|
|
|
|
} catch (EncodingException e) {
|
2018-09-25 19:36:56 +02:00
|
|
|
throw new ParseException("Secret is not valid base32.");
|
2018-06-06 16:15:31 +02:00
|
|
|
}
|
2018-01-01 22:14:11 +01:00
|
|
|
|
2018-06-06 16:15:31 +02:00
|
|
|
OtpInfo info;
|
2018-01-01 22:14:11 +01:00
|
|
|
try {
|
2018-06-06 16:15:31 +02:00
|
|
|
switch (type.toLowerCase()) {
|
2019-03-31 22:15:03 +02:00
|
|
|
case TotpInfo.ID:
|
|
|
|
info = new TotpInfo(secret, algo, digits, parsePeriod());
|
|
|
|
break;
|
|
|
|
case SteamInfo.ID:
|
|
|
|
info = new SteamInfo(secret, algo, digits, parsePeriod());
|
2018-06-06 16:15:31 +02:00
|
|
|
break;
|
2019-03-31 22:15:03 +02:00
|
|
|
case HotpInfo.ID:
|
2018-06-06 16:15:31 +02:00
|
|
|
long counter;
|
|
|
|
try {
|
2021-01-17 13:12:43 +01:00
|
|
|
counter = Long.parseLong(_textPeriodCounter.getText().toString());
|
2018-06-06 16:15:31 +02:00
|
|
|
} catch (NumberFormatException e) {
|
2018-09-25 19:36:56 +02:00
|
|
|
throw new ParseException("Counter is not an integer.");
|
2018-06-06 16:15:31 +02:00
|
|
|
}
|
|
|
|
info = new HotpInfo(secret, algo, digits, counter);
|
|
|
|
break;
|
|
|
|
default:
|
2020-05-02 18:51:12 +02:00
|
|
|
throw new RuntimeException(String.format("Unsupported OTP type: %s", type));
|
2018-06-06 16:15:31 +02:00
|
|
|
}
|
|
|
|
|
2018-01-01 22:14:11 +01:00
|
|
|
info.setDigits(digits);
|
|
|
|
info.setAlgorithm(algo);
|
2018-06-06 16:15:31 +02:00
|
|
|
} catch (OtpInfoException e) {
|
2018-09-25 19:36:56 +02:00
|
|
|
throw new ParseException("The entered info is incorrect: " + e.getMessage());
|
2018-01-01 22:14:11 +01:00
|
|
|
}
|
2017-12-27 22:04:22 +01:00
|
|
|
|
2019-12-25 19:21:34 +01:00
|
|
|
VaultEntry entry = Cloner.clone(_origEntry);
|
2019-09-04 21:42:01 +02:00
|
|
|
entry.setInfo(info);
|
2018-06-06 16:15:31 +02:00
|
|
|
entry.setIssuer(_textIssuer.getText().toString());
|
|
|
|
entry.setName(_textName.getText().toString());
|
|
|
|
|
2021-01-17 13:12:43 +01:00
|
|
|
int groupPos = _dropdownGroupList.indexOf(_dropdownGroup.getText().toString());
|
2018-12-11 11:44:36 +01:00
|
|
|
if (groupPos != 0) {
|
2021-01-17 13:12:43 +01:00
|
|
|
String group = _dropdownGroupList.get(groupPos);
|
2018-12-11 11:44:36 +01:00
|
|
|
entry.setGroup(group);
|
|
|
|
} else {
|
|
|
|
entry.setGroup(null);
|
|
|
|
}
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
if (_hasChangedIcon) {
|
|
|
|
if (_hasCustomIcon) {
|
2019-06-23 10:18:10 +02:00
|
|
|
Bitmap bitmap = ((BitmapDrawable) _iconView.getDrawable()).getBitmap();
|
2018-09-25 19:36:56 +02:00
|
|
|
ByteArrayOutputStream stream = new ByteArrayOutputStream();
|
2019-06-23 10:18:10 +02:00
|
|
|
bitmap.compress(Bitmap.CompressFormat.JPEG, 90, stream);
|
2018-09-25 19:36:56 +02:00
|
|
|
byte[] data = stream.toByteArray();
|
|
|
|
entry.setIcon(data);
|
|
|
|
} else {
|
|
|
|
entry.setIcon(null);
|
|
|
|
}
|
2018-06-07 12:27:42 +02:00
|
|
|
}
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
return entry;
|
2017-12-27 22:04:22 +01:00
|
|
|
}
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
private void onSaveError(String msg) {
|
2018-11-15 22:20:31 +01:00
|
|
|
Dialogs.showSecureDialog(new AlertDialog.Builder(this)
|
2018-10-09 23:13:51 +02:00
|
|
|
.setTitle(getString(R.string.saving_profile_error))
|
2017-12-27 22:04:22 +01:00
|
|
|
.setMessage(msg)
|
|
|
|
.setPositiveButton(android.R.string.ok, null)
|
2018-11-15 22:20:31 +01:00
|
|
|
.create());
|
2017-12-27 22:04:22 +01:00
|
|
|
}
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
private boolean onSave() {
|
2020-05-24 13:43:59 +02:00
|
|
|
if (_isEditingIcon) {
|
|
|
|
stopEditingIcon(true);
|
|
|
|
}
|
|
|
|
|
2019-12-25 19:21:34 +01:00
|
|
|
VaultEntry entry;
|
2018-09-25 19:36:56 +02:00
|
|
|
try {
|
|
|
|
entry = parseEntry();
|
|
|
|
} catch (ParseException e) {
|
|
|
|
onSaveError(e.getMessage());
|
|
|
|
return false;
|
2017-12-27 22:04:22 +01:00
|
|
|
}
|
|
|
|
|
2020-05-02 18:51:33 +02:00
|
|
|
addAndFinish(entry);
|
2018-09-25 19:36:56 +02:00
|
|
|
return true;
|
|
|
|
}
|
2017-12-27 22:04:22 +01:00
|
|
|
|
2018-06-06 16:27:56 +02:00
|
|
|
private TextWatcher _iconChangeListener = new TextWatcher() {
|
|
|
|
@Override
|
|
|
|
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void afterTextChanged(Editable s) {
|
2018-09-25 19:36:56 +02:00
|
|
|
if (!_hasCustomIcon) {
|
2018-06-07 12:27:42 +02:00
|
|
|
TextDrawable drawable = TextDrawableHelper.generate(_textIssuer.getText().toString(), _textName.getText().toString(), _iconView);
|
|
|
|
_iconView.setImageDrawable(drawable);
|
|
|
|
}
|
2018-06-06 16:27:56 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-09-25 19:36:56 +02:00
|
|
|
private static class ParseException extends Exception {
|
|
|
|
public ParseException(String message) {
|
|
|
|
super(message);
|
|
|
|
}
|
|
|
|
}
|
2017-12-27 22:04:22 +01:00
|
|
|
}
|