chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

fix database migration to v29 (#2354)

Browse source
This commit is contained in:
Konrad Pozniak 2022-02-27 20:16:41 +01:00 • committed by GitHub
commit 2c91b1148c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
View file

@ -80,7 +80,7 @@ data class ConversationStatusEntity(
val spoilerText: String,
val attachments: ArrayList<Attachment>,
val mentions: List<Status.Mention>,
val tags: List<HashTag>,
val tags: List<HashTag>?,
val showingHiddenContent: Boolean,
val expanded: Boolean,
val collapsible: Boolean,

2
app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt
View file

@ -161,7 +161,7 @@ fun TimelineStatusWithAccount.toViewData(gson: Gson): StatusViewData {
val attachments: ArrayList<Attachment> = gson.fromJson(status.attachments, attachmentArrayListType) ?: arrayListOf()
val mentions: List<Status.Mention> = gson.fromJson(status.mentions, mentionListType) ?: emptyList()
val tags: List<HashTag> = gson.fromJson(status.tags, tagListType) ?: emptyList()
val tags: List<HashTag>? = gson.fromJson(status.tags, tagListType)
val application = gson.fromJson(status.application, Status.Application::class.java)
val emojis: List<Emoji> = gson.fromJson(status.emojis, emojisListType) ?: emptyList()
val poll: Poll? = gson.fromJson(status.poll, Poll::class.java)

2
app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java
View file

@ -461,7 +461,7 @@ public abstract class AppDatabase extends RoomDatabase {
public static final Migration MIGRATION_28_29 = new Migration(28, 29) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
database.execSQL("ALTER TABLE `ConversationEntity` ADD COLUMN `s_tags` TEXT NOT NULL");
database.execSQL("ALTER TABLE `ConversationEntity` ADD COLUMN `s_tags` TEXT");
database.execSQL("ALTER TABLE `TimelineStatusEntity` ADD COLUMN `tags` TEXT");
}
};

2
app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
View file

@ -42,7 +42,7 @@ data class Status(
val visibility: Visibility,
@SerializedName("media_attachments") var attachments: ArrayList<Attachment>,
val mentions: List<Mention>,
val tags: List<HashTag>,
val tags: List<HashTag>?,
val application: Application?,
val pinned: Boolean?,
val muted: Boolean?,