mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-25 22:26:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
1253 commits 17 branches 167 tags 34 MiB
Commit graph

1055 commits

Author SHA1 Message Date
stefan-niedermann
59dc831c8e Fix some smaller lint issues 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-28 08:03:11 +01:00
stefan-niedermann
31ff82384f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteReadonlyFragment.java
 2020-02-28 07:59:08 +01:00
stefan-niedermann
3187ca6eab Fix #750 Split up NoteSQLiteOpenHelper 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-28 07:57:03 +01:00
Christoph Loy
599f5482fb
Switch order of comparison for migration 11 in NoteSQLiteOpenHelper 2020-02-26 19:08:19 +01:00
Christoph Loy
284387778d
Add warning to not change the names of Enum constants in DarkModeSetting 2020-02-26 19:04:43 +01:00
Christoph Loy
84fdfc7ea3
Add graceful migration of the old boolean setting to the new String setting 2020-02-26 19:00:37 +01:00
Christoph Loy
2dbd7e303b
Remove all translations of "pref_value_theme_light" 2020-02-26 01:18:36 +01:00
Christoph Loy
bb73ab7b6d
Merge branch 'master' into default-dark-mode 2020-02-26 00:41:50 +01:00
Christoph Loy
d94abac8a2 Make Getters in AccountChooserViewHolder private 2020-02-26 00:25:26 +01:00
Christoph Loy
44f15c9628 Try to fix lint "Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes." 2020-02-26 00:25:26 +01:00
Christoph Loy
52cd277f81 Remove butterknife dependency 2020-02-26 00:25:26 +01:00
Christoph Loy
36e8ba38d3 Remove Butterknife from AboutFragmentLicenseTab 2020-02-26 00:25:26 +01:00
Christoph Loy
4977a64fbb Remove Butterknife from AboutFragmentCreditsTab 2020-02-26 00:25:26 +01:00
Christoph Loy
86408d7457 Remove Butterknife from NoteEditFragment 2020-02-26 00:25:26 +01:00
Christoph Loy
2c2c4b4e7d Remove Butterknife from AccountChooserAdapter 2020-02-26 00:25:26 +01:00
Christoph Loy
40a633e510 Remove Butterknife from CategoryAdapter 2020-02-26 00:25:26 +01:00
Christoph Loy
d4398b722e Remove Butterknife from NotePreviewFragment 2020-02-26 00:25:26 +01:00
Christoph Loy
2373b0ebb7 Remove Butterknife from AboutFragmentContributingTab 2020-02-26 00:25:26 +01:00
Christoph Loy
e4b5a413b1 Remove Butterknife from AccountChooserDialogFragment 2020-02-26 00:25:26 +01:00
Christoph Loy
b3ace46318 Remove Butterknife from NoteReadonlyFragment 2020-02-26 00:25:26 +01:00
Christoph Loy
ba3cfe512b Remove Butterknife from CategoryDialogFragment 2020-02-26 00:25:26 +01:00
Christoph Loy
cdd0916b4d Remove Butterknife from ExceptionActivity 2020-02-26 00:25:26 +01:00
Christoph Loy
500753cc08 Remove Butterknife from EditNoteActivity 2020-02-26 00:25:26 +01:00
Christoph Loy
01fa17cae1 Remove Butterknife from AboutActivity 2020-02-26 00:25:26 +01:00
Christoph Loy
f6fab7f635 Remove Butterknife from SelectSingleNoteActivity 2020-02-26 00:25:26 +01:00
Christoph Loy
80691a9e1a Remove Butterknife from NotesListViewActivity 2020-02-26 00:25:26 +01:00
Christoph Loy
a213197027 Remove Butterknife from PreferencesActivity 2020-02-26 00:25:26 +01:00
Christoph Loy
eefb31aaa4 Remove Butterknife from NavigationAdapter 2020-02-26 00:25:26 +01:00
Christoph Loy
077c303a71 Replace Butterknife with Viewbinding in ItemAdapter 2020-02-26 00:25:26 +01:00
Christoph Loy
61a2341893 Enable viewbinding in gradle plugin 2020-02-26 00:25:26 +01:00
Christoph Loy
20c4ea0d0c
Fix lint warning 2020-02-24 22:10:50 +01:00
Christoph Loy
79e630b999
Add basic implementation to support "System default" in dark mode settings 2020-02-24 21:42:07 +01:00
Nextcloud bot
8f7ab6d824 [tx-robot] updated from transifex 2020-02-24 20:05:32 +01:00
stefan-niedermann
98e8754e94 Fix some linter issues 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-24 19:54:58 +01:00
stefan-niedermann
c426e1839c Remove dead test code 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-24 18:50:38 +01:00
stefan-niedermann
75bdb4c2cc Mock TextUtils and moved NoteLinksUtilsTest to test package 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-24 18:48:20 +01:00
Christoph Loy
ea0bfdfd90 Revert unneeded diffs in NoteLinksUtilsTest 2020-02-24 18:25:15 +01:00
Christoph Loy
f61701487c Move NoteLinksUtilsTest back to androidTest and revert to using TextUtils in NoteLinksUtils 2020-02-24 18:25:15 +01:00
Christoph Loy
b88429a200 Remove manual NPE and replace it with Objects#requireNonNull 2020-02-24 18:25:15 +01:00
Christoph Loy
b9f041332f Remove unneeded diffs 2020-02-24 18:25:15 +01:00
Christoph Loy
eb9cba14f3 Move Tests from androidTests to tests 2020-02-24 18:25:15 +01:00
stefan-niedermann
e7ca48e0d5 Use requireX instead of Objects.requireNonNull 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-24 10:56:12 +01:00
Mario Danic
bd0f3fc87d Fix #718 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-02-23 20:52:45 +01:00
stefan-niedermann
fee05a32cc Fix missing import 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-23 19:07:42 +01:00
stefan-niedermann
1231664b1d Merge branch 'master' into 354-password-protection 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2020-02-23 19:06:56 +01:00
stefan-niedermann
d5877c463d Refactoring 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-23 18:16:59 +01:00
stefan-niedermann
a72e2a03d4 Add MarkdownUtilTest 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-23 18:16:07 +01:00
stefan-niedermann
5acec3dc4b Fix unit tests 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-23 17:51:09 +01:00
stefan-niedermann
8848b73d92 Adjust some old unit tests 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-23 17:39:43 +01:00
stefan-niedermann
95658a6d31 Implement menu for context based formatting without selected range 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-23 17:27:29 +01:00
stefan-niedermann
052c6202b3 Implement menu for context based formatting without selected range 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-23 15:22:42 +01:00
stefan-niedermann
13016ea7ba Implement menu for context based formatting without selected range 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-22 11:48:55 +01:00
stefan-niedermann
985a6cd197 Merge remote-tracking branch 'origin/master' 2020-02-22 11:43:46 +01:00
Nextcloud bot
6ff297afdb [tx-robot] updated from transifex 2020-02-22 11:43:33 +01:00
stefan-niedermann
f1a480eb62 Clear Glide cache when manually swipe down to refresh 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-22 11:23:53 +01:00
dependabot-preview[bot]
29b3b7d2e4 Bump fragment from 1.2.1 to 1.2.2 
Bumps fragment from 1.2.1 to 1.2.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 12:49:35 +01:00
dependabot-preview[bot]
dc9bc41efa Bump work-runtime from 2.3.1 to 2.3.2 
Bumps work-runtime from 2.3.1 to 2.3.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 07:51:57 +01:00
stefan-niedermann
76b8416649 Fix #710 NextcloudApiNotResponding 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-19 20:23:53 +01:00
stefan-niedermann
968e96373d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/ExceptionActivity.java
 2020-02-19 20:22:36 +01:00
Nextcloud bot
278179267c [tx-robot] updated from transifex 2020-02-19 20:22:09 +01:00
Nextcloud bot
3cd2756638 [tx-robot] updated from transifex 2020-02-16 15:57:34 +01:00
stefan-niedermann
b672b505f7 version bump to 2.10.2 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-16 15:57:34 +01:00
stefan-niedermann
5855064d9c Fix #730 API Level 15 cannot use ?android: attributes 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-16 15:57:34 +01:00
stefan-niedermann
442b598dc0 Fix NullPointerException 
Attempt to invoke interface method 'java.util.Iterator java.util.List.iterator()' on a null object reference

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-16 15:57:07 +01:00
Nextcloud bot
b73d94480a [tx-robot] updated from transifex 2020-02-16 11:24:56 +01:00
stefan-niedermann
96e9b04d5b version bump to 2.10.2 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-16 11:22:14 +01:00
stefan-niedermann
7c6f0392bb Fix #730 API Level 15 cannot use ?android: attributes 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-16 11:20:30 +01:00
stefan-niedermann
b9e7ea606e Fix NullPointerException 
Attempt to invoke interface method 'java.util.Iterator java.util.List.iterator()' on a null object reference

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-16 11:01:28 +01:00
stefan-niedermann
4b1c60e874 Use new nextcloud-commons library for uncaught exception handling 
https://github.com/stefan-niedermann/nextcloud-commons

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-12 20:17:13 +01:00
stefan-niedermann
e87ddac3a0 Use new nextcloud-commons library for SSO Glide integration 
https://github.com/stefan-niedermann/nextcloud-commons

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-12 18:02:44 +01:00
stefan-niedermann
58eaaa84bc Fix #666 Glide does not use SSO network stack 
Use new nextcloud-commons library for SSO Glide integration

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-12 13:18:38 +01:00
stefan-niedermann
9560552682 Fix #666 Glide does not use SSO network stack 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-10 14:37:46 +01:00
stefan-niedermann
0bcfc0b14f Fix #666 Glide does not use SSO network stack 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-10 13:50:38 +01:00
Niedermann IT-Dienstleistungen
6a9cf4f5f7
Merge branch 'master' into 354-password-protection 2020-02-07 10:39:47 +01:00
stefan-niedermann
0125009abc version bump to 2.10.1 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:43:55 +01:00
dependabot-preview[bot]
c94ea2f59e Bump material from 1.0.0 to 1.1.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.0.0...1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 20:42:18 +01:00
Nextcloud bot
6803804a45 [tx-robot] updated from transifex 2020-02-05 20:41:51 +01:00
stefan-niedermann
e5dfb98972 Do not break push on error (see #713) 
https://github.com/stefan-niedermann/nextcloud-notes/pull/721#issuecomment-582457235
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:34:26 +01:00
stefan-niedermann
800c138e7b Reinstanciate NotesListViewItemTouchHelper everytime the ssoAccount changes 
Former behavior:

onCreate: ssoAccount is still null, therefore swiping will not immediately upsync
selectAccount: Didn't affect the swipe behavior and could lead to wrong immediately upsyncs with a wrong account
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:34:26 +01:00
stefan-niedermann
2ac7bc6c0b Do not break push on error (see #713) 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:34:26 +01:00
stefan-niedermann
ae6d1629ee Do not break push on error (see #713) 
Removed 507 handling on pulling changes since pulling shouldn't change the server state and therefore never return a 507 HTTP

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:34:26 +01:00
stefan-niedermann
d6aef638e2 Do not break push on error (see #713) 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:34:26 +01:00
stefan-niedermann
99e63c9ea9 Do not break push on error (see #713) 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:34:26 +01:00
stefan-niedermann
35a36eae9c Do not break push on error (see #713) 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-05 20:34:26 +01:00
stefan-niedermann
acdbeb206c Handle some cases of bad sync more gracefully 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-04 18:24:37 +01:00
stefan-niedermann
4fa0329c91 Fix #715 Multiselect broken 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-04 18:14:11 +01:00
stefan-niedermann
edfb60f588 Merge branch '679-insufficient-storage' 
# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/79.txt
 2020-02-04 17:58:36 +01:00
stefan-niedermann
dddf6abb71 #679 Lots of empty notes are created if the server is full 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-04 17:57:19 +01:00
stefan-niedermann
672e3efea5 #558 Move the cursor to the beginning of the document after entering the character 
Add flag to prevent endless loop

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-04 17:29:49 +01:00
stefan-niedermann
7a51165271 #558 Move the cursor to the beginning of the document after entering the character 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-04 17:29:49 +01:00
stefan-niedermann
f182352f89 Change the font color for Markdown (#716) 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-04 17:26:44 +01:00
stefan-niedermann
eff00d25ac Fix #679 Lots of empty notes are created if the server is full 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-01 18:14:25 +01:00
stefan-niedermann
7bd950244a Fix #557 Black theme for OLED devices 🌓 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-02-01 12:15:04 +01:00
stefan-niedermann
25393b111a version bump to 2.10.0 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-01-31 13:57:50 +01:00
stefan-niedermann
847dc896fe Add new icon for monospace font 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-01-31 13:56:22 +01:00
stefan-niedermann
68ed8c9998 Merge branch 'master' into 354-password-protection 
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
#	app/src/main/res/values/strings.xml
 2020-01-31 12:58:45 +01:00
stefan-niedermann
3dfbf53d23 Merge branch 'sync-worker' 2020-01-31 12:56:28 +01:00
Nextcloud bot
0115cb3d8a [tx-robot] updated from transifex 2020-01-31 12:56:00 +01:00
stefan-niedermann
822e121039 #656 Background synchronization 
Handle sync requests without proper SingleSignOn-Account

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-01-31 12:53:45 +01:00
stefan-niedermann
a1b83d415b Switch from deprecated singleLine="true" to maxLines="1" 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-01-31 08:45:15 +01:00
stefan-niedermann
f6876bc71a Enhanced migration from versions < 2.0.0 
Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-01-31 08:44:44 +01:00
stefan-niedermann
3b18b1b94f #656 Background synchronization 
Add preference to UI

Signed-off-by: stefan-niedermann <info@niedermann.it>
 2020-01-30 18:32:38 +01:00
stefan-niedermann
a48fc3ce3e #656 Background synchronization 
Use strings as hashmap keys
 2020-01-29 23:29:02 +01:00
stefan-niedermann
37795f5cdf #656 Background synchronization 
Make everything from database to sync multi-account-able
 2020-01-29 22:38:55 +01:00
stefan-niedermann
72f53ef7b4 Disable synchronized return of Result on background sync 2020-01-29 20:49:49 +01:00
stefan-niedermann
2c408e83dd #656 Background synchronization 2020-01-29 19:42:04 +01:00
stefan-niedermann
1412b8f5f7 Merge branch 'master' into sync-worker 2020-01-29 19:30:22 +01:00
stefan-niedermann
8c07d32d9a Fixed imports 2020-01-29 19:29:50 +01:00
stefan-niedermann
108a6824f9 Merge branch 'master' into 354-password-protection 
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
 2020-01-29 19:28:00 +01:00
stefan-niedermann
f08b001889 Refactoring 2020-01-29 19:25:03 +01:00
stefan-niedermann
34dfee1636 version bump to 2.9.0 (disabled software layer rendering for images) 2020-01-29 16:13:18 +01:00
stefan-niedermann
c20044c23d version bump to 2.9.0 2020-01-28 19:25:36 +01:00
Nextcloud bot
2bdb1922cc [tx-robot] updated from transifex 2020-01-28 19:21:19 +01:00
stefan-niedermann
df1d936abd #378 Enhance category handling 
Remove padding analog to preferences dialogs and account chooser dialog
 2020-01-28 19:18:34 +01:00
stefan-niedermann
abb3b8a5f2 🖼️ Display images which are linked using markdown syntax 
Added documentation
 2020-01-28 19:14:30 +01:00
stefan-niedermann
b0364b5bfc Merge remote-tracking branch 'origin/master' 2020-01-28 19:10:11 +01:00
stefan-niedermann
deccff826f 🖼️ Display images which are linked using markdown syntax 2020-01-28 19:08:46 +01:00
Nextcloud bot
7fdbad963c [tx-robot] updated from transifex 2020-01-27 07:31:37 +01:00
stefan-niedermann
1ed17b2ebd Merge branch 'master' into 354-password-protection 2020-01-26 10:06:17 +01:00
stefan-niedermann
488a9f2941 Merge branch 'theme-rework' 
# Conflicts:
#	app/src/main/res/layout/activity_notes_list_view.xml
 2020-01-26 10:03:26 +01:00
stefan-niedermann
e106745631 Use themeoverlay for toolbars 2020-01-26 09:16:56 +01:00
stefan-niedermann
887b76141b Fix shadow color of header text in dark mode 2020-01-26 08:38:57 +01:00
stefan-niedermann
f485ebcbd1 Remove custom alert styling 2020-01-26 08:33:34 +01:00
stefan-niedermann
27a0a83e56 If clipboard data contains URL, directly link it when using CBF 2020-01-26 08:22:32 +01:00
stefan-niedermann
8cde2223ee Move empty content view to own xml file 2020-01-26 07:55:51 +01:00
stefan-niedermann
b751dfe310 Replace direct color assignments with ?android: attributes 2020-01-25 16:57:06 +01:00
stefan-niedermann
71d5d73657 Merge branch 'master' into 354-password-protection 2020-01-25 15:56:46 +01:00
stefan-niedermann
18dd44f848 Rename layout files according to their functions 2020-01-25 15:56:24 +01:00
stefan-niedermann
ff8a67f611 Merge branch 'master' into 354-password-protection 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2020-01-25 15:35:47 +01:00
stefan-niedermann
d66c26f8ba Adjust icon colors 2020-01-25 15:34:52 +01:00
stefan-niedermann
32ef99dcd6 #378 Enhance category handling 
Added padding to EditText
 2020-01-25 15:24:27 +01:00
stefan-niedermann
067e49aeb7 #365 Password protection 
Added log
 2020-01-25 14:45:10 +01:00
stefan-niedermann
439cafdcf1 #365 Password protection 
Refactoring
 2020-01-25 13:58:57 +01:00
stefan-niedermann
d8ea4da54c #365 Password protection 
Added preference UI
 2020-01-25 13:41:44 +01:00
stefan-niedermann
a1be4f7284 #365 Password protection 2020-01-25 13:05:51 +01:00
stefan-niedermann
8bca3aa3b4 #365 Password protection 
Move unlock logic to own activity
 2020-01-25 12:40:17 +01:00
stefan-niedermann
4e12fcef77 #365 Password protection 
Refactor onActivityResult
 2020-01-25 11:56:43 +01:00
stefan-niedermann
cc5b91ffaf #365 Password protection 
Proof of concept
 2020-01-25 11:46:21 +01:00
stefan-niedermann
f0f26fc3a8 Fix missing semicolon 2020-01-25 11:24:34 +01:00
stefan-niedermann
4e93f7f698 Merge branch 'master' into enhance-category-handling 
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
 2020-01-25 11:22:55 +01:00
Nextcloud bot
f14711b57b [tx-robot] updated from transifex 2020-01-25 11:21:06 +01:00
stefan-niedermann
213174d6ca #466 Header title not aligned 
Use custom layout for preference items to align text to title
 2020-01-25 11:18:25 +01:00
stefan-niedermann
0d27086f9a #466 Header title not aligned 
Use PreferenceFragmentCompat for settings
 2020-01-25 09:58:41 +01:00
stefan-niedermann
b08c4fd8fb #466 Header title not aligned 
Move to toolbars
 2020-01-25 09:36:04 +01:00
stefan-niedermann
65bd9e3530 #466 Header title not aligned 
Move to toolbars
 2020-01-25 09:29:44 +01:00
stefan-niedermann
f8e1fa930c #378 Enhance category handling 
- Enhanced paddings
- Only display keyboard when no category is given yet
 2020-01-24 21:03:44 +01:00
stefan-niedermann
0f8e517a7f #378 Enhance category handling 2020-01-24 20:49:31 +01:00
stefan-niedermann
b446e17aca Merge remote-tracking branch 'origin/enhance-category-handling' into enhance-category-handling 
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java
#	app/src/main/res/layout/dialog_change_category.xml
 2020-01-24 18:23:04 +01:00
stefan-niedermann
d12eab5b51 #378 Enhance category handling 2020-01-24 18:19:24 +01:00
stefan-niedermann
97c622d255 Fix imports 2020-01-24 16:38:44 +01:00