diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-04-02 20:03:41 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-04-02 20:15:54 +0300 |
| commit | e38805a4d86e3e3a757677689e86cdbbd136a5ea (patch) | |
| tree | 36f292ebcba5b5abcb656eb40c2a6aaf8497963c /app/src/main/java/it/niedermann/owncloud/notes/shared | |
| parent | 1a0e99fd4d456e02ef38332fc1a50ad842f0142a (diff) | |
| parent | 0b48efa8b20c2dfca87f3ca78bdcb65227160093 (diff) | |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/AbstractNotesDatabase.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_19_20.java
# app/src/main/res/values-hu-rHU/strings.xml
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/shared')
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/shared/model/ServerResponse.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ServerResponse.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ServerResponse.java index 2f13d9ac..60c4ad5e 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ServerResponse.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ServerResponse.java @@ -87,7 +87,7 @@ public class ServerResponse { } if (!json.isNull(NotesClient.JSON_MODIFIED)) { modified = Calendar.getInstance(); - modified.setTimeInMillis(json.getLong(NotesClient.JSON_MODIFIED) * 1000); + modified.setTimeInMillis(json.getLong(NotesClient.JSON_MODIFIED) * 1_000); } if (!json.isNull(NotesClient.JSON_FAVORITE)) { favorite = json.getBoolean(NotesClient.JSON_FAVORITE); |