thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests 1 Wiki Activity Actions 1

Fix up merge error

Browse source
This commit is contained in:
Arne 2024-11-29 13:14:08 +01:00
parent 76bbfadd94
commit 77ae0a9283
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

@ -363,12 +363,12 @@ public class DatabaseBackend extends SQLiteOpenHelper {
db.execSQL("PRAGMA monocles.user_version = 11");
}
if(cheogramVersion < 12) {
if(monoclesVersion < 12) {
db.execSQL(
"ALTER TABLE cheogram." + Message.TABLENAME + " " +
"ALTER TABLE monocles." + Message.TABLENAME + " " +
"ADD COLUMN notificationDismissed NUMBER DEFAULT 0"
);
db.execSQL("PRAGMA cheogram.user_version = 12");
db.execSQL("PRAGMA monocles.user_version = 12");
}
db.setTransactionSuccessful();

2
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1451,6 +1451,7 @@ public class ConversationFragment extends XmppFragment
Log.d(Config.LOGTAG, "lost take photo uri. unable to to attach");
}
break;
}
case ATTACHMENT_CHOICE_EDIT_PHOTO:
final Uri editedUriPhoto = data.getParcelableExtra(EditActivity.KEY_EDITED_URI);
if (editedUriPhoto != null) {
@ -1460,7 +1461,6 @@ public class ConversationFragment extends XmppFragment
Log.d(Config.LOGTAG, "lost take photo uri. unable to to attach");
}
break;
}
case ATTACHMENT_CHOICE_CHOOSE_FILE:
case ATTACHMENT_CHOICE_RECORD_VIDEO:
case ATTACHMENT_CHOICE_RECORD_VOICE: