fabian/telegram_backup
1
0
Fork 0
mirror of https://github.com/fabianonline/telegram_backup.git synced 2024-10-31 23:54:05 +00:00
Code Issues Releases Wiki Activity

Fix that old sticker, with an empty sticker set id caused a crash

Browse Source
This commit is contained in:
Hannes 2018-05-13 12:56:31 +02:00
parent 223a0fdde3
commit 9c1f495782
No known key found for this signature in database
GPG Key ID: 0DEE6AD1C8EDBD87
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/de/fabianonline/telegram_backup/mediafilemanager/StickerFileManager.kt
View File

@ -1,16 +1,16 @@
/* Telegram_Backup /* Telegram_Backup
* Copyright (C) 2016 Fabian Schlenz * Copyright (C) 2016 Fabian Schlenz
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */ * along with this program. If not, see <http://www.gnu.org/licenses/>. */
@ -56,14 +56,18 @@ import de.fabianonline.telegram_backup.*
class StickerFileManager(message: JsonObject, file_base: String) : DocumentFileManager(message, file_base) { class StickerFileManager(message: JsonObject, file_base: String) : DocumentFileManager(message, file_base) {
override val isSticker = true override val isSticker = true
val json = message["media"]["document"].obj val json = message["media"]["document"].obj
val sticker = json["attributes"].array.first{it.obj.isA("documentAttributeSticker")}.obj val sticker = json["attributes"].array.first{it.obj.isA("documentAttributeSticker")}.obj
override var isEmpty = sticker["stickerset"].obj.isA("inputStickerSetEmpty") override var isEmpty = sticker["stickerset"].obj.isA("inputStickerSetEmpty")
private val filenameBase: String private val filenameBase: String
get() { get() {
val set = sticker["stickerset"].obj.get("shortName").nullString ?: sticker["stickerset"].obj.get("id").string val stickerSet = sticker["stickerset"].obj
val set = stickerSet.get("shortName").nullString
?: stickerSet.get("id").nullString
?: stickerSet.get("_constructor").nullString
?: error("could not get a good name from: ${sticker["stickerset"]}")
val hash = sticker["alt"].string.hashCode() val hash = sticker["alt"].string.hashCode()
return "${set}_${hash}" return "${set}_${hash}"
} }