Commit graph

652 commits

Author SHA1 Message Date
RichyHBM
0404f8110d Merge branch 'master' into broadcast-receiver 2018-02-10 17:06:41 +00:00
Jakob Nixdorf
69590b0163
Merge pull request #124 from andOTP/append-date-backup
Append date backup
2018-02-09 11:34:42 +01:00
Jakob Nixdorf
a13f75a864
Check if the Intent is null before getting data 2018-02-09 10:50:14 +01:00
RichyHBM
3353d84192 Use correct file name for backup type 2018-02-01 19:11:54 +00:00
RichyHBM
578f05a6b1 Add settings to select appending 2018-02-01 13:21:04 +00:00
RichyHBM
8869799ffb Add constants for dated filename 2018-02-01 13:06:39 +00:00
Jakob Nixdorf
9d4cde2946
Bug fix release 0.4.0.1 2018-02-01 10:11:31 +01:00
Jakob Nixdorf
bcd8009203
Fix wrong password migration 2018-02-01 10:08:25 +01:00
Jakob Nixdorf
49129462da
Bump to version 0.4.0 2018-01-31 22:06:28 +01:00
Jakob Nixdorf
a3ea64bf80
Merge pull request #123 from RichyHBM/generic-icons
Add generic icons and reddit icon
2018-01-31 21:37:50 +01:00
Jakob Nixdorf
209a72eff0
Some final fixes for the language list 2018-01-31 21:35:03 +01:00
Jakob Nixdorf
07aa379f75
Translation bump
* New translation: Catalan (thanks to isard)
 * Updated all existing translations
2018-01-31 21:24:38 +01:00
RichyHBM
4884c4f4ed Add generic icons and reddit icon 2018-01-30 21:31:03 +00:00
Jakob Nixdorf
09ee724abb
Update contributors 2018-01-24 16:04:07 +01:00
Jakob Nixdorf
e6d31db4db
Add source file for the NAS thumbnail 2018-01-24 07:40:15 +01:00
Jakob Nixdorf
010def3ad9
Add generic NAS thumbnail 2018-01-24 07:37:34 +01:00
Jakob Nixdorf
23d813928e
Thumbnail for OVH
Closes #118
2018-01-22 14:57:30 +01:00
Jakob Nixdorf
f6a9765abf
Thumbnails for Humble Bundle and Terminal
Closes #119
2018-01-22 14:18:34 +01:00
Jakob Nixdorf
bba7c08305
Merge pull request #117 from mbertram/feature/npm-heroku-thumbs
Add thumbnails for Heroku and npm
2018-01-22 11:33:44 +01:00
Matthias Bertram
7ef95646c0 Simplify the vector path of the npm thumbnail 2018-01-20 10:43:07 +01:00
Matthias Bertram
dae6d307b8 Resizes the thumbnail for npm 2018-01-19 16:44:01 +01:00
Matthias Bertram
e0e431f3b1 Add thumbnails for Heroku and npm 2018-01-19 15:19:36 +01:00
Jakob Nixdorf
b21845374b
Change the format used to store the language
Fixes #112
2018-01-17 23:25:55 +01:00
Jakob Nixdorf
b9dcfef7d0
Reword the copy toast a little bit 2018-01-17 10:28:20 +01:00
Jakob Nixdorf
f4b3ce608a
Merge pull request #114 from andOTP/fix-113
Copy to clipboard when opening the uri fails
2018-01-17 10:25:14 +01:00
RichyHBM
6886e015f2 Remove OpenPGP receiver as OpenPGP makes use of bindService internally and that cant be called from a broadcast receiver 2018-01-16 22:54:10 +00:00
RichyHBM
155c1481ff Use correct file names for each type of backup 2018-01-15 21:08:42 +00:00
Richy HBM
4f0c15da79
Copy to clipboard if uri fails 2018-01-15 19:19:20 +00:00
Richy HBM
575b753262
Add new string for clipboard toast 2018-01-15 19:15:05 +00:00
RichyHBM
00d6e9b936 Broadcast receivers for all types of backups 2018-01-14 17:59:01 +00:00
RichyHBM
b88d32e0ca Disable google sync on change to keystore 2018-01-13 13:59:18 +00:00
Jakob Nixdorf
1345e4fc73
Some minor rewording 2018-01-12 16:12:24 +01:00
Jakob Nixdorf
350982a39a
Use a 128-bit encryption key for password-based encryption 2018-01-12 10:51:04 +01:00
RichyHBM
0389084561 Merge branch 'master' into google-backups 2018-01-11 22:44:53 +00:00
Jakob Nixdorf
cceadee413
Update README 2018-01-11 16:43:39 +01:00
Jakob Nixdorf
0c8c5018fe
Main author -> Main developer (in About) 2018-01-11 16:17:24 +01:00
Jakob Nixdorf
da17ff33f7
Reformat the title card in About 2018-01-11 16:15:46 +01:00
Jakob Nixdorf
7394b5365b
Merge pull request #97 from RichyHBM/more-crypto-thumbnails
Add thumbnails for binance, bittrex, blockchaininfo, iconomi, kucoin,…
2018-01-11 15:54:27 +01:00
Jakob Nixdorf
a0c9249b15
Add extra padding to the bottom of the RecyclerView
Fixes #95
2018-01-11 15:53:33 +01:00
Jakob Nixdorf
6e92add768
Merge pull request #108 from RichyHBM/add-developer
Add RichyHBM as a developer
2018-01-11 15:32:09 +01:00
Jakob Nixdorf
d7e4bd73d1
Fix crash in Tools when the string is null 2018-01-11 15:29:08 +01:00
Jakob Nixdorf
584dfc552a
Fix ApplicationTest 2018-01-11 15:26:57 +01:00
Jakob Nixdorf
62f3ffba39
Merge pull request #93 from DanielWeigl/master
split token with a space every three letters
Closes #83
2018-01-11 15:25:13 +01:00
RichyHBM
467b058d01 Fix merge issues 2018-01-11 14:22:42 +00:00
Jakob Nixdorf
89f55ce5d7
Merge branch 'master' into master 2018-01-11 15:16:57 +01:00
Jakob Nixdorf
ca317aa739
Merge branch 'master' into master 2018-01-11 15:15:07 +01:00
Jakob Nixdorf
1989a2aa4e
Merge pull request #102 from RichyHBM/hide_thumbnail_in_dropdown
Move thumbnail toggle into the size selector
Closes #98
2018-01-11 15:10:25 +01:00
RichyHBM
41ca299af6 Merge branch 'master' into google-backups
# Conflicts:
#	app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
#	app/src/main/java/org/shadowice/flocke/andotp/Utilities/DatabaseHelper.java
#	app/src/main/res/values/settings.xml
#	app/src/main/res/values/strings_settings.xml
#	app/src/main/res/xml/preferences_special.xml
2018-01-11 13:58:40 +00:00
Jakob Nixdorf
b529f009be
Merge branch 'custom-encryption'
Closes #94
2018-01-11 13:18:54 +01:00
Jakob Nixdorf
0c0fb0f2c7
Update first run dialog 2018-01-11 13:14:40 +01:00