Commit Graph

905 Commits

Author SHA1 Message Date
Tibor Kaputa 6f51e72608
Merge pull request #212 from Aga-C/polish-translation
Updated Polish translation
2021-09-24 19:37:00 +02:00
Agnieszka C 652d23b70d Updated Polish translation 2021-09-24 19:18:32 +02:00
tibbi 83b4300362 lets actually remove the un/pinning from the thread activity 2021-09-24 18:45:06 +02:00
Tibor Kaputa 46e9750fb5
Merge pull request #211 from KryptKode/fix/wrong-sender-name
fix wrong sender name from private contacts
2021-09-24 18:41:49 +02:00
Tibor Kaputa 7fae2d8324
Merge branch 'master' into fix/wrong-sender-name 2021-09-24 18:41:38 +02:00
tibbi 24a39b74f4 lets show the pin and unpin menu buttons in case they fit 2021-09-24 18:38:40 +02:00
tibbi c9d7642a4b some cleaup of the recent pull requests 2021-09-24 18:37:10 +02:00
Tibor Kaputa a2b8a77f42
Merge pull request #208 from Aga-C/add-pin-conversation
Added pinning conversations (#197)
2021-09-24 18:34:43 +02:00
Tibor Kaputa e92943b167
Merge branch 'master' into add-pin-conversation 2021-09-24 18:34:15 +02:00
Tibor Kaputa 163b86c2f8
Merge pull request #209 from KryptKode/feat/export-sms
Feat/export messages
2021-09-24 18:29:25 +02:00
Tibor Kaputa 24bc3931aa
Update strings.xml 2021-09-24 18:27:09 +02:00
Tibor Kaputa 03ff16f633
minor code style update 2021-09-24 17:58:28 +02:00
Tibor Kaputa 516131787c
removing a newline 2021-09-24 17:58:01 +02:00
Tibor Kaputa cc06bfa7f3
adding some spaces 2021-09-24 17:57:34 +02:00
darthpaul 50088ca967 Merge remote-tracking branch 'origin/feat/export-sms' into feat/export-sms
# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt
2021-09-24 15:09:24 +01:00
darthpaul 24c08613d9 remove unused callback in ImportMessagesDialog 2021-09-24 15:07:40 +01:00
darthpaul 5e3c0af34d update commons dependency 2021-09-24 14:56:51 +01:00
darthpaul 492cbdf13a fix wrong sender name in SMS notification 2021-09-24 14:30:17 +01:00
darthpaul 91d81e3bd8 fix wrong sender name from private contacts
- use SimpleContact.doesHavePhoneNumber to perform comparision between a sender and private contact. SimpleContact.doesHavePhoneNumber does equality check.
2021-09-24 13:57:15 +01:00
Tibor Kaputa ae870aa048
adding some start margin to the export filename label 2021-09-22 23:02:48 +02:00
Tibor Kaputa ec2352e597
minor code update 2021-09-22 22:59:51 +02:00
Tibor Kaputa cbd6e7fa60
prevent importing the messages twice by confirming the dialog 2021-09-22 22:56:14 +02:00
Tibor Kaputa de57cc3085
minor code cleanup 2021-09-22 22:55:31 +02:00
darthpaul 3cd84e42bc Handle validation where no export options are checked 2021-09-21 15:29:38 +01:00
darthpaul 27a9cf4369 Handle cases where sms or mms does not exist in import or export 2021-09-21 15:19:09 +01:00
Tibor Kaputa 27180c6053
correcting the file extension label from txt to json 2021-09-21 12:08:04 +02:00
Tibor Kaputa 41d9d067cf
Update build.gradle 2021-09-21 12:07:34 +02:00
Tibor Kaputa cb1affb711
correcting an Android OS version check 2021-09-21 12:03:07 +02:00
Tibor Kaputa ea9c317a11
correcting an Android OS version check 2021-09-21 12:01:41 +02:00
Tibor Kaputa 7069230506
Update dialog_export_messages.xml 2021-09-21 12:00:05 +02:00
Tibor Kaputa 72f0e27655
Make sure the Settings menu button is above About 2021-09-21 10:15:33 +02:00
Tibor Kaputa 3ed3ce2a9b
Update build.gradle 2021-09-21 10:14:38 +02:00
Agnieszka C 0f12365fc5
Merge branch 'master' into add-pin-conversation 2021-09-21 07:30:00 +02:00
Tibor Kaputa b774abdf58
Merge pull request #210 from Aga-C/add-hide-read-unread
Added hiding option "mark as read/unread" for conversations
2021-09-20 22:45:18 +02:00
Tibor Kaputa 9f5fbd2e1e
avoid fetching selected conversations too many times 2021-09-20 22:44:55 +02:00
Tibor Kaputa 4243679f2d
updating some slovak strings 2021-09-20 22:40:40 +02:00
Tibor Kaputa e033dd284a
removing some useles comments 2021-09-20 22:34:50 +02:00
Tibor Kaputa b0890dd581
updating commons 2021-09-20 22:28:43 +02:00
Tibor Kaputa 00b97dd639
Update dialog_export_messages.xml 2021-09-20 22:27:03 +02:00
Agnieszka C 6c32a449d8 Code style fixing 2021-09-20 10:13:48 +02:00
Agnieszka C ee9959cf8c Added hiding read/unread conversations 2021-09-20 09:41:45 +02:00
darthpaul 98cd90b5f2 Update strings 2021-09-18 22:36:19 +01:00
darthpaul a5109da19f Merge branch 'master' into feat/export-sms
# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
2021-09-18 22:16:12 +01:00
darthpaul 31ad2d1421 Merge remote-tracking branch 'origin/feat/export-sms' into feat/export-sms
# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesExporter.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesImporter.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesReader.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/MessagesWriter.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ExportedMessage.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SmsBackup.kt
2021-09-18 22:11:23 +01:00
darthpaul 04cac740ee Cleanup code and remove logs 2021-09-18 22:07:13 +01:00
darthpaul 24d9988ec1 Add progress callbacks to importer and exporter, not used yet 2021-09-18 21:54:44 +01:00
darthpaul d78776e288 feat: use models during export, try to update conversation date during import 2021-09-18 21:05:06 +01:00
Agnieszka C c14e1f5b95 Added pinning conversations (#197) 2021-09-18 19:23:55 +02:00
darthpaul e10a410788 feat: restore mms 2021-09-18 16:14:58 +01:00
tibbi 52ebeeedc6 updating changelog 2021-09-16 22:58:53 +02:00