Commit graph

622 commits

Author SHA1 Message Date
Mohamed Zenadi
4663ea371e fix list not being refreshed after a sync 2016-10-16 18:25:46 +02:00
Mohamed Zenadi
cb7f9c8529 sdk and libs version update 2016-10-16 18:25:46 +02:00
Daniël van den Berg
1e658042cf Allow for manual copying or sharing of the password without showing it. (#222)
* Allow for manual copying or sharing of the password without showing it, see #218.

* Cache the password in a variable for copying and sending, instead of using the textview.
2016-09-21 12:57:42 +02:00
Mohamed Zenadi
4c5edec404 use a file selector to get the ssh-key 2016-09-11 15:18:04 +02:00
Jaroslav Lichtblau
4e4f32d12d Czech translation (#220)
updated with adding new strings
2016-09-09 11:48:07 +02:00
Daniël van den Berg
a6da17417e Added the ability to move passwords around. (#210)
* Added the ability to move passwords around.
* Generified the PasswordRecyclerAdapter and the FolderRecyclerAdapter into EntryRecyclerAdapter
2016-09-09 11:47:49 +02:00
Daniël van den Berg
86083f03f5 Added the ability to share a password as plaintext using any app, including ones like BluetoothToPc. (#213) 2016-08-27 15:21:21 +02:00
Daniël van den Berg
4075fddd60 Fixed crash when ellipsing line. (#208)
* Fixed crash when ellipsing line. See https://github.com/zeapo/Android-Password-Store/issues/207.

* Added the ability to move passwords around.

* Revert "Added the ability to move passwords around."

This reverts commit 458f5ea1d9c85be78edf8d7d2d8077b20b12f168.

* Removed maxlines:1
2016-08-18 14:24:22 +02:00
Matthew Wong
8be387c5a7 version bump 52 2016-07-29 21:00:49 -04:00
Matthew Wong
dda1e99a08 Catch IOException 2016-07-29 20:59:31 -04:00
Matthew Wong
33cebc8a49 Don't show the 'directory already exists' error if it's just a .git folder & show all exceptions to the user (e.g. invalid private key) 2016-07-29 20:41:40 -04:00
Matthew Wong
cd02d6fe9e version bump 51 (fdroid issue?) 2016-07-24 22:40:09 -04:00
Matthew Wong
a22b5573ec version bump 50 2016-07-21 21:07:23 -04:00
Matthew Wong
ca10446914 Use support library fragment (to avoid onAttach deprecation problems, etc) 2016-07-21 20:49:41 -04:00
Matthew Wong
1e5303a142 version bump 69 2016-07-19 20:27:39 -04:00
Matthew Wong
9c2326336b fix crash sorry everyone 2016-07-19 20:27:09 -04:00
Matthew Wong
e12e604443 version bump 68 2016-07-17 13:24:50 -04:00
Matthew Wong
017650bf37 Fix back button behaviour 2016-07-08 22:00:53 -04:00
Mohamed Zenadi
4589c0f833 rebump
mistake on the play store
2016-07-04 09:44:38 +02:00
Mohamed Zenadi
bfbd7e5b6f version bump 2016-07-04 09:27:55 +02:00
Mohamed Zenadi
3d5a448566 fix crash on lollipop 2016-07-04 09:02:57 +02:00
Matthew Wong
e31d76d73a version bump 65 2016-07-02 13:37:42 -04:00
Matthew Wong
7826dce526 Only clear the clipboard if we automatically copied the password to it 2016-07-02 13:36:27 -04:00
Matthew Wong
5a509af320 Fix & refine weird editing behaviour 2016-07-02 13:30:59 -04:00
Matthew Wong
8664d5e8ec version bump 64 2016-06-30 20:26:28 -04:00
Matthew Wong
810e76cc6d Add systemui exception to autofill 2016-06-30 20:25:33 -04:00
Matthew Wong
7da9633a3c use runOnUiThread in autofill preferences activity 2016-06-30 20:16:12 -04:00
Mohamed Zenadi
a49399ab54 Merge pull request #191 from svetlemodry/master
Czech translation updated
2016-06-20 00:18:12 +02:00
Mohamed Zenadi
7336c614e9 Merge pull request #189 from DSIW/master
Some restyling
2016-06-20 00:17:41 +02:00
DSIW
7c0062e24f Fix background color for selected list items 2016-06-19 16:40:29 +02:00
DSIW
7dca04c314 Use material icons in actionbar 2016-06-19 16:40:29 +02:00
DSIW
d32b03baa5 Add german translation and extract some string as string resource 2016-06-19 16:40:29 +02:00
Jaroslav Lichtblau
0e186709a5 Czech translation updated
for android pw store

Czech translation updated
for android pw store

typo fix
2016-06-18 21:18:18 +02:00
Matthew Wong
b4a230d074 fix #187 2016-06-12 15:46:59 -04:00
Matthew Wong
f739b1c564 update build tools 2016-06-12 15:45:28 -04:00
DSIW
d1c15a43d5 Restyle new password formular 2016-06-10 06:30:25 +02:00
DSIW
da1e95241d Restyle password entry activity 2016-06-10 05:43:56 +02:00
DSIW
7a25cbf1d6 Fix multiple selection with RecyclerView 2016-06-10 04:50:56 +02:00
DSIW
0e700ce21b Add icons to list item 2016-06-10 04:50:56 +02:00
DSIW
09f12c81c1 Remove CardView and use divider for separation 2016-06-10 04:50:56 +02:00
DSIW
b36d082b9f Restyle password cards 2016-06-10 03:13:09 +02:00
Matthew Wong
f6f0576caf Switch positions of edit and delete buttons 2016-05-14 20:34:23 -04:00
Matthew Wong
cacf739f6d add edit long press action 2016-05-14 20:30:55 -04:00
Mohamed Zenadi
59eec3dc81 version bump 2016-04-28 08:37:55 +02:00
Mohamed Zenadi
82403f262d fix an issue on android 6 where the passwords are centered 2016-04-28 08:29:33 +02:00
Mohamed Zenadi
b578da4a55 version bump 62 2016-04-28 00:04:02 +02:00
Mohamed Zenadi
c866596d13 no confirmation/no deletion when using sd-card directory 2016-04-27 23:59:34 +02:00
Mohamed Zenadi
73f1b9c7b2 version bump 2016-04-25 23:00:58 +02:00
Mohamed Zenadi
53f2962e5d fix a confusion on which button does what 2016-04-25 22:56:48 +02:00
Mohamed Zenadi
7c538698fa versions upgrade 2016-04-25 22:56:48 +02:00
Mohamed Zenadi
6935e6d5f7 add translations to cz values as they are lacking
need to be translated
2016-04-25 22:56:48 +02:00
Matthew Wong
81981557f8 version bump 60 2016-03-16 19:14:16 -04:00
Matthew Wong
1e970e1043 split setwebmatchingpassword and setappmatchingpassword for clarity 2016-03-07 20:42:33 -05:00
Matthew Wong
c9725d7186 fix crash if url not found 2016-03-07 20:35:24 -05:00
Matthew Wong
ba3cf0162d fix #172 firefox autofill crash 2016-03-07 20:04:51 -05:00
Matthew Wong
c6b9c69971 Version bump 59 2016-01-05 19:42:01 -05:00
Matthew Wong
aaa9af93de fix getrootinactivewindow() nullpointerexceptions 2016-01-03 20:39:37 -05:00
Matthew Wong
6ef9e3bbca avoid event.getsource nullpointerexception 2016-01-03 20:27:26 -05:00
Matthew Wong
35e30a67c4 Comments 2015-12-31 18:38:10 -05:00
Matthew Wong
963859b347 Fix settings and add "pick and match" option 2015-12-31 18:26:43 -05:00
Matthew Wong
a3e10d3ca8 Fix 'Delete' nullpointerexception and revert to working URL-getting 2015-12-31 07:20:48 -05:00
Matthew Wong
c3b87f5b18 Also check for default browser webview 2015-12-31 06:51:47 -05:00
Matthew Wong
ba1ef7a38e Merge branch 'upstream' into webview
Conflicts:
	app/build.gradle
2015-12-31 06:24:05 -05:00
Matthew Wong
a782c3f83e Add 'pick password' option that shows only when no other items are available (+travis) 2015-12-31 05:14:37 -05:00
Matthew Wong
1d9e3b50a5 Delete option for websites 2015-12-31 04:28:42 -05:00
Matthew Wong
1c3a4fe763 Use URL as package name for app/website settings and match Chrome using URL. But use site title for automatching attempts when URL match not found 2015-12-31 03:47:51 -05:00
Matthew Wong
cdf27fc24d Get the URL in Chrome 2015-12-30 05:50:56 -05:00
Matthew Wong
ebd565ec37 add always show dialog preference. 2015-12-30 01:18:42 -05:00
Matthew Wong
5263ed10bb Fix string 2015-12-30 00:22:53 -05:00
Matthew Wong
8c884bcba8 Add websites to autofill preferences 2015-12-30 00:15:08 -05:00
Matthew Wong
5cb380bf47 Don't use ResolveInfo for app settings ui 2015-12-27 06:00:06 -05:00
Matthew Wong
94ee36a38d Use website title from chrome to match with passwords 2015-12-27 04:07:11 -05:00
Matthew Wong
893e0ce89d Version bump 58 2015-12-26 02:26:59 -05:00
Matthew Wong
9684c6c8a1 Delete unused gen. public key 2015-12-26 02:19:12 -05:00
Matthew Wong
406d6c0425 check for blank username & update 'hostname' all in saveConfiguration() 2015-12-23 18:19:25 -05:00
Matthew Wong
23c5603b7f new gradle plugin and build tools 2015-12-23 00:51:36 -05:00
Matthew Wong
24b8999290 Don't crash if no storage permission and it's needed 2015-12-23 00:20:09 -05:00
Matthew Wong
60f65818f9 Update hostname variable with needed protocol prefix when hitting SAVE not just CLONE (addresses #94, maybe some of the oddities observed in #137) 2015-12-22 21:13:59 -05:00
Matthew Wong
6f9f50db29 Version bump 2015-12-06 21:56:39 -05:00
Jaroslav Lichtblau
e224527125 updated Czech translation 2015-11-23 19:49:57 +01:00
zeapo
5d6d349e62 warn if the directory is not empty 2015-11-22 14:30:37 +01:00
zeapo
6e789a38f1 Add warnings to the user about storing the passwords on the sdcard 2015-11-22 14:19:06 +01:00
Matthew Wong
97087ba33e version bump 2015-11-21 04:20:09 -05:00
Matthew Wong
7ee5ff76ba default to reasonable external directory 2015-11-21 04:18:07 -05:00
Matthew Wong
ab2b4d699b remove some unused code 2015-11-07 20:45:11 -05:00
Matthew Wong
d83fc186b2 Request system_alert_window permission in android m, fix #138, 2015-11-07 20:17:46 -05:00
Matthew Wong
4653fa2c10 Search for android.webkit.webview 2015-11-07 20:17:46 -05:00
Matthew Wong
7a9ed6897d Per-app settings hint text show # of picked matches 2015-11-07 20:17:45 -05:00
Matthew Wong
a22cd874fd Smaller dialog size 2015-11-07 20:17:45 -05:00
Matthew Wong
8fa173e7d2 set and pick from multiple passwords per app 2015-11-07 20:17:44 -05:00
Matthew Wong
72e32c95f6 undo process change. (not a simple change, sharedpreferences don't work) 2015-11-07 20:17:44 -05:00
Matthew Wong
d68c06a4a6 Let dialog be null 2015-11-07 20:17:44 -05:00
Matthew Wong
28eae33567 Use File instead of PasswordItem for using file to fill 2015-11-07 20:17:41 -05:00
Matthew Wong
f2a4b944d8 Make chrome/webview send password field focus events 2015-11-07 20:17:11 -05:00
Matthew Wong
4a6901b309 Separate service & main process since service should be always running by itself 2015-11-07 20:16:56 -05:00
Matthew Wong
28379439de search for webview recursively (& search files instead of passworditems) 2015-11-07 20:16:43 -05:00
Matthew Wong
b78465b744 Request system_alert_window permission in android m, fix #138, 2015-11-07 19:51:06 -05:00
Matthew Wong
54a05daa82 cleanup: split autofill service into functions 2015-11-04 16:56:12 -05:00
Matthew Wong
f783ad84ee OpenPGP API v9 #143 2015-10-29 20:13:38 -04:00
Matthew Wong
55c312ddaa enable autofill for chrome & webview password fields (not useful yet) 2015-10-28 18:54:44 -04:00
Matthew Wong
3cb06e92e2 Version bump 55 2015-10-28 14:11:53 -04:00
Matthew Wong
a404af3018 Fix #142 2015-10-28 14:08:56 -04:00
Matthew Wong
3fe7978142 Try to address #142 2015-10-28 13:30:44 -04:00
Matthew Wong
81abb7954d If system alert dialog permission denied, autofill service will do nothing instead of crash #138 2015-10-18 23:24:42 -04:00
Matthew Wong
6abcebef18 Offer #135 behaviour: if show time set to 0, don't clear clipboard or hide password for the user 2015-10-18 22:50:08 -04:00
Matthew Wong
91c7f8f558 Correct background color of 'app settings' 2015-10-18 21:54:25 -04:00
Mohamed Zenadi
389501730f version bump 2015-10-13 20:31:51 +02:00
Mohamed Zenadi
d885693532 revert to old colors, blue/orange was indeed ugly 2015-10-13 20:16:13 +02:00
Jaroslav Lichtblau
1d0d3147bb Czech translation update
for android-password-store
2015-10-03 21:15:34 +02:00
Matthew Wong
452be1e083 Version bump 53 2015-09-25 08:16:17 -04:00
Matthew Wong
f277c53837 buildToolsVersion "23.0.1" 2015-09-25 08:14:57 -04:00
Matthew Wong
8ed4449e4b Use intent for ensuring commit after decrypt->edit button->save 2015-09-16 11:26:51 -04:00
Matthew Wong
394a549f7e Open dialog immediately at activity oncreate, can't open it after asynctask (potential illegalstateexception) 2015-09-15 23:54:17 -04:00
Matthew Wong
68e1495ef2 Use openpgpapi correctly to address #128 2015-09-03 15:00:01 -04:00
Mohamed Zenadi
c534cfe498 Merge pull request #125 from betheg/signed_release
a way to generating signed release APK using gradle.
2015-09-03 14:42:38 +02:00
Matthew Wong
7d7ec73664 version bump 52: pgp npe crash! 2015-08-29 04:08:30 -04:00
Michael
1a1cc1c29b PgpHandler: fix possible npe. 2015-08-29 09:40:54 +02:00
Michael
beafaecc49 a way to generating signed release APK using gradle. 2015-08-29 09:35:19 +02:00
Michael
67b7ff0a7e get rid of the WARNING: Dependency org.apache.httpcomponents:httpclient... 2015-08-28 20:13:36 +02:00
Matthew Wong
a314563ca9 Some UI loading for #119 2015-08-27 19:17:00 -04:00
Matthew Wong
a59f5b4cc7 Fix #120 -- editing not creating git commits and yet another version bump 2015-08-26 18:03:23 -04:00
Matthew Wong
f6d3dc23fb UI cleanup & reformat 2015-08-26 17:03:37 -04:00
Matthew Wong
88f0cddd58 SDK 23 2015-08-26 16:43:00 -04:00
Matthew Wong
b3166bca50 version bump 50 2015-08-26 16:04:11 -04:00
Matthew Wong
7c390ba81b Fix edit button crashing if pressed from encrypt 2015-08-26 04:09:08 -04:00
Matthew Wong
c54d28af8a Disallow name change when editing password 2015-08-26 03:49:36 -04:00
Matthew Wong
540349542b Revert asynctask cancelling; allow parallel asynctasks 2015-08-26 03:25:55 -04:00
Matthew Wong
6665c0b2e9 Password editing: action bar edit button replaces decrypt view with encrypt view 2015-08-25 21:02:11 -04:00
Matthew Wong
df4a27eeac version bump 49 2015-08-25 14:03:17 -04:00
Matthew Wong
e5a72a5175 Show which passwords are selected 2015-08-25 13:58:55 -04:00
Matthew Wong
1f612e3d8b Use support AlertDialog everywhere 2015-08-25 13:53:28 -04:00
Matthew Wong
dc732cb573 Generated password EditText to TextView + fix generation bug 2015-08-25 13:47:13 -04:00
Matthew Wong
a73e8625f5 Settings dependent on service enabled 2015-08-16 16:58:03 -04:00
Matthew Wong
bc086220d2 Screenshots for instructions/information 2015-08-16 15:06:07 -04:00
Matthew Wong
ce59194228 More instructions/information 2015-08-16 15:01:32 -04:00
Matthew Wong
640f6ff9bd Prepend first/never keywords with / . file names won't begin with / 2015-08-15 13:00:12 -04:00
Matthew Wong
5caa665111 Ensure enable autofill checkbox appearance matches setting 2015-08-14 17:38:18 -04:00
Matthew Wong
ebe1f831e7 strings & enable service preference 2015-08-14 17:38:18 -04:00
Matthew Wong
b1807197f8 Fix crash on first start & use documentLaunchMode for nicer openkeychain-api behaviour (5+ only) 2015-08-14 17:38:17 -04:00
Matthew Wong
8388d8530a Load icons & labels async beforehand as well 2015-08-14 17:38:17 -04:00
Matthew Wong
b260a19be7 App filtering 2015-08-14 17:38:17 -04:00
Matthew Wong
ca45e739da Async populate the app list 2015-08-14 17:38:16 -04:00
Matthew Wong
ac533d83aa Preference activity up & back behaviour. Especially when opened with 'Settings' dialog button 2015-08-14 17:38:05 -04:00
Matthew Wong
ec07e1eea6 Preference activity overhaul 2015-08-14 17:36:52 -04:00
Matthew Wong
29b92f4a6d Make service compatible with latest PasswordRepository changes 2015-08-14 17:36:52 -04:00
Matthew Wong
04192a88a5 Settings page dividers 2015-08-14 17:36:51 -04:00
Matthew Wong
f4c0ee607e Multi-select deletion of apps in settings page 2015-08-14 17:36:51 -04:00
Matthew Wong
b75190fcd7 Add 'automatically match by default' setting; respect it & per-app settings when creating autofill dialog 2015-08-14 17:36:51 -04:00
Matthew Wong
d42c526b64 passwordfragment changes 2015-08-14 17:36:50 -04:00
Matthew Wong
7c41795ded Open settings from password fill dialog 2015-08-14 17:36:50 -04:00
Matthew Wong
42a971f348 Move preferences to its own activity, leaving a "blank" openkeychain api one 2015-08-14 17:36:49 -04:00
Matthew Wong
2889454d32 More tweaks of dialog dismissal behaviour 2015-08-14 17:36:49 -04:00
Matthew Wong
3523a0497b Fix recursive filter; don't act twice on focus+click event 2015-08-14 17:36:49 -04:00
Matthew Wong
1ceb41acb6 Handle click events as well (useful when password field is the only focusable view) 2015-08-14 17:36:48 -04:00
Matthew Wong
ad173d9d05 Autofill per-app settings dialog opens on click on suggestion or on existing app 2015-08-14 17:36:48 -04:00
Matthew Wong
51a05087e5 Add searching for apps in autofill settings page 2015-08-14 17:36:47 -04:00
Matthew Wong
2d7c37d379 Add per-app settings page 2015-08-14 17:36:47 -04:00
Matthew Wong
4b15ea3ae9 Initialize the repository automatically, don't require the app to do it after a restart 2015-08-14 17:36:46 -04:00
Matthew Wong
7182db30b7 Ignore focus only when it is from a successful performAction 2015-08-14 17:36:46 -04:00
Matthew Wong
0c0054b565 Dialog dismissal behaviour. (com.android.inputmethod, the keyboard, is a TYPE_WINDOW_STATE_CHANGED, so needs an exception) 2015-08-14 17:36:46 -04:00
Matthew Wong
485b621b04 Change dialog appearance, smaller (wraps content) 2015-08-14 17:36:45 -04:00
Matthew Wong
690155391c Dismiss dialog if non password field or window change (the accessibility events already needed to be handled) 2015-08-14 17:36:45 -04:00
Matthew Wong
8c266187cb Fill in field immediately after user unlocks 2015-08-14 17:36:45 -04:00
Matthew Wong
e937ddf111 Only try again paste/set after decryption if the correct password was entered and not e.g. cancel button pressed 2015-08-14 17:36:44 -04:00
Matthew Wong
02bfcf6c3f Create app autofill service: a dialog pops up for all password fields & has a button to paste/set a password found in the store with name matching app's 2015-08-14 17:36:44 -04:00
Matthew Wong
eced1dd314 Move UI things to UI thread 2015-08-14 17:35:43 -04:00
Matthew Wong
838471ec3a initialize & getRepositoryDirectory take context arguments so that service can use them too 2015-08-12 21:07:47 -04:00
Mohamed Zenadi
58d93d757d show the full category of the password
with a small style revamp
2015-08-12 22:33:48 +02:00
Matthew Wong
0cb325f4b1 Fix #118: use File.equals 2015-08-12 10:05:43 -04:00
Matthew Wong
113dadd227 Open password deletion dialogs one-by-one instead of all at once, don't rely on the order of opening (potentially prevent #115) 2015-08-11 17:39:35 -04:00
Matthew Wong
083f340f29 Keep selectedItems up-to-date safely (behaviour was undefined before?) 2015-08-11 16:59:55 -04:00
Mohamed Zenadi
4845300730 a test apk build for #116 2015-08-11 19:13:39 +02:00
Mohamed Zenadi
b1e37eaefb add a way to get the password repo dir without worktree 2015-08-11 19:13:38 +02:00
Matthew Wong
33667d86e4 Fix passwords appearing like they have been selected after exiting 'delete mode' 2015-08-11 12:01:37 -04:00
Mohamed Zenadi
4b3fb7e484 bump version to 48 2015-08-10 07:10:24 +02:00
Mohamed Zenadi
57037916b0 check that we have a repository before cloning 2015-08-10 06:50:18 +02:00
Matthew Wong
2adbeeeba7 Use getAdapterPosition instead of position variable set in onBindViewHolder 2015-08-09 13:53:31 -04:00
Matthew Wong
b37b9fed5d Ensure positions of passwords after deleted password are updated (attempt to fix #115) 2015-08-08 11:26:07 -04:00
Mohamed Zenadi
feb8eefcc4 fix potential NPE 2015-08-03 00:03:37 +02:00
Mohamed Zenadi
d57246adb1 update of libs and version bump 2015-08-03 00:03:37 +02:00
Jaroslav Lichtblau
d2f5df48ee Czech translation updated
for Android-Password-Store
2015-08-02 11:38:24 +02:00
Mohamed Zenadi
294f068991 prompt for an external dir if none is selected 2015-07-26 14:54:07 +02:00
Matthew Wong
e45afa3392 Don't ask for ssh key passphrase if key is not encrypted with one #106 2015-07-22 01:02:06 -04:00
Matthew Wong
d95286660a Add 'clear clipboard 20 times' preference 2015-07-21 16:15:36 -04:00
Mohamed Zenadi
9ff126a3fb disable proguard in release 2015-07-21 21:49:37 +02:00
Matthew Wong
2407cf69f1 fix release build crash 2015-07-21 15:40:04 -04:00
Matthew Wong
6b1cbc6578 version bump 2015-07-21 04:46:09 -04:00
Matthew Wong
f17f48bce7 Version bump (oops...) 2015-07-19 23:04:57 -04:00
Matthew Wong
3b12c79a6c ssh keys with empty passphrase should not be written as "encrypted" (said keys still worked) 2015-07-19 22:46:39 -04:00
Matthew Wong
7e0b860816 Revert change that causes 'copy' to crash app 2015-07-19 19:27:36 -04:00
Mohamed Zenadi
d2b48099fa enable proguard and versions bumps 2015-07-19 14:16:27 +02:00
Mohamed Zenadi
83f1d18fc1 addd missing strings into the cs lang (no translation yet) 2015-07-19 14:16:03 +02:00
Mohamed Zenadi
38c57cec6d handle rotation in password list and password decrypt 2015-07-19 13:51:24 +02:00
Mohamed Zenadi
7517c65075 Merge pull request #103 from wongma7/master
SSH key generator
2015-07-19 13:31:00 +02:00
Mohamed Zenadi
ea899faa07 fix some issues where the password repository was not initialized 2015-07-19 12:09:58 +02:00
Matthew Wong
4ec3e1956f Set result & finish so that if the user presses generate when prompted for generate/import, operation is resumed just like if user presses import 2015-07-18 23:58:19 -04:00
Mohamed Zenadi
eb65c2283f fix #100 where passwords were not copied if we didn't show them 2015-07-19 00:53:07 +02:00
Matthew Wong
33a4a183eb Remove fontfamily xml 2015-07-18 16:25:16 -04:00
Matthew Wong
dcf66672fe v.find vs getDialog.find consistency and fix more textview/edittext 2015-07-18 16:04:23 -04:00
Matthew Wong
01b7b2102d Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java
2015-07-18 15:57:19 -04:00