localhorst/TextureSync
3
1
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

resize&shortcuts #25

Manually merged
CodeSteak merged 16 commits from resize into master 2019-06-12 19:11:15 +02:00
Conversation 1 Commits 16 Files Changed 19 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6fbfa050b3 - Show all commits

4
client/src/main/kotlin/org/hso/texturesyncclient/controller/net/InternalJsonModel.kt
View File

@ -30,7 +30,7 @@ internal data class InternalTexture(
resolution = arrayOf(tex.resolution.first, tex.resolution.second),
added_on = arrayOf(
tex.addedOn.get(Calendar.YEAR), //
tex.addedOn.get(Calendar.MONTH), //
tex.addedOn.get(Calendar.MONTH) + 1, //
tex.addedOn.get(Calendar.DAY_OF_MONTH)
),
texture_hash = tex.textureHash.toString()
@ -50,7 +50,7 @@ internal data class InternalTexture(
else -> throw ConnectionInvalidJsonException()
},
resolution = Pair(resolution[0], resolution[1]),
addedOn = GregorianCalendar(added_on[0], added_on[1], added_on[2]),
addedOn = GregorianCalendar(added_on[0], added_on[1] - 1, added_on[2]),
textureHash = Sha256(texture_hash)
)
} catch (e: Exception) { // i Know, but no time :[]