Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
cd931b8
Refactoring code to better reflect new App purpose.
matej-gutman Sep 24, 2021
60ffd67
Delete 1.json
matej-gutman Sep 24, 2021
c93f924
Some more refactoring. Refactored LOGIN and REGISTER part to prepare …
matej-gutman Oct 20, 2021
b8a6c21
Refactored part of source that handles blog posts and prepared it for…
matej-gutman Oct 21, 2021
bcd4440
Bugfix: server only reports relative image location. BASE_URL appended.
matej-gutman Oct 22, 2021
3861827
Bugfix: server only reports relative image location. BASE_URL appended.
matej-gutman Oct 22, 2021
a2ce720
The 'get blog' functionality added and tested.
matej-gutman Oct 25, 2021
33960b5
Added BASE_URL to glide load image while viewing blog.
matej-gutman Oct 25, 2021
193b57c
Modified checking of task owner to fit new server API.
matej-gutman Oct 25, 2021
29bd7ad
Bugfix: blogs (now tasks) were ordered incorrectly. They are ordered …
matej-gutman Oct 26, 2021
34c0087
Bugfix: the content of file is read via InputStream instead of binary…
matej-gutman Nov 2, 2021
baee614
Code cleanup.
matej-gutman Nov 2, 2021
c0801e4
Account fragment update. New scheme that handles new server requests …
matej-gutman Nov 3, 2021
e85c2d8
Account update set for new API.
matej-gutman Nov 3, 2021
080f39b
Change password updated to reflect new API.
matej-gutman Nov 3, 2021
1e253bf
Bugfix: launching account fragment caused auth token to be deleted fr…
matej-gutman Nov 6, 2021
169ccec
Added support for filtering and ordering tailored for new server API.
matej-gutman Dec 3, 2021
f6412f5
Added support for filtering by 'updated' and 'created' parameter.
matej-gutman Dec 3, 2021
06be0bb
Refactored 'blog' to 'task' and 'slug' to 'id' to better reflect new …
matej-gutman Dec 13, 2021
3f9badd
Refactored 'publish' to 'create'.
matej-gutman Dec 13, 2021
e6c6fdb
Bugfix: if task was deleted from server, it now deletes from cache wh…
matej-gutman Dec 14, 2021
8999c5e
Password reset form path changed.
matej-gutman Jan 4, 2022
5f95099
'Server Message Translator' class added to help with translating mess…
matej-gutman Jan 6, 2022
b97c049
Server messages translator tested successfully.
matej-gutman Jan 6, 2022
ea1b3ca
translations to Slovenian and Spanish
Apr 11, 2022
8cae788
translating server messages
Apr 20, 2022
a557082
check if the role is admin
luna-zivkovic Apr 25, 2022
b5ab035
Small changes
luna-zivkovic Apr 25, 2022
28c557f
user registration by admin
luna-zivkovic Apr 26, 2022
3fa184f
getting all users from server and displaying them
luna-zivkovic May 3, 2022
1e31235
get data from a particular user
luna-zivkovic May 4, 2022
0fd07eb
updating users features except role
luna-zivkovic May 12, 2022
1757b66
updating users role
luna-zivkovic May 15, 2022
f7ec1ef
UI - edit users profile change
luna-zivkovic May 16, 2022
d7e0e54
updating UI
luna-zivkovic May 23, 2022
1f57721
handling exceptions
luna-zivkovic May 31, 2022
2e9366a
admin permitions
luna-zivkovic Jun 24, 2022
16081a0
locking pictures
luna-zivkovic Jul 7, 2022
1415271
changes
luna-zivkovic Jul 16, 2022
9d62235
small changes
luna-zivkovic Jul 18, 2022
3b074aa
admin rights
luna-zivkovic Jul 19, 2022
a1df0f7
tests
luna-zivkovic Jul 19, 2022
713d733
removing udp
luna-zivkovic Jul 20, 2022
6ead572
port change
luna-zivkovic Jul 20, 2022
f8870e5
removing comments
luna-zivkovic Jul 20, 2022
8373d00
adding udp
luna-zivkovic Aug 5, 2022
40c5402
removing udp
luna-zivkovic Aug 5, 2022
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Server messages translator tested successfully.
  • Loading branch information
matej-gutman committed Jan 6, 2022
commit b97c049dbdb2fbbb7e8f1bfe2d9d7d513da229a7
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.templateapp.cloudapi.presentation.util

class ServerMsgStrings {
companion object {
const val ERROR_EMAIL_EXISTS = "{\"error\":\"Email already exists.\"}"
const val ERROR_PASSWORDS_MISMATCH = "{\"error\":\"The passwords do not match.\"}"

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.templateapp.cloudapi.presentation.util

import android.app.Application
import com.templateapp.cloudapi.R
import javax.inject.Inject
import javax.inject.Singleton
import com.templateapp.cloudapi.presentation.util.ServerMsgStrings.Companion.ERROR_EMAIL_EXISTS
import com.templateapp.cloudapi.presentation.util.ServerMsgStrings.Companion.ERROR_PASSWORDS_MISMATCH

/*
* This message translator builds a table of messages returned by server. The translator offers
Expand All @@ -19,7 +19,8 @@ class ServerMsgTranslator (
*/
private val translationsStrings = hashMapOf(
/* Server responses */
"Email already exists." to application.getString(R.string.error_email_exists),
ERROR_EMAIL_EXISTS to application.getString(R.string.error_email_exists),
ERROR_PASSWORDS_MISMATCH to application.getString(R.string.error_passwords_do_not_match),
/* "Unable to authenticate." to application.getString(R.string.error_unable_to_authenticate),
"User information update success." to application.getString(R.string.success_user_data_updates),
"Name already exists." to application.getString(R.string.error_name_exists),
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@

<!-- Dialogs -->
<string name="error_email_exists">User with this email is already registered.</string>
<string name="error_passwords_do_not_match">Passwords mismatch. Please try again.</string>

</resources>

Expand Down