Merge branch 'SimpleMobileTools:master' into duplication_fixes

This commit is contained in:
Naveen Singh 2022-09-13 23:06:58 +05:30 committed by GitHub
commit f48b63b97a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
140 changed files with 116 additions and 109 deletions

View file

@ -63,7 +63,7 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:141660c8f9'
implementation 'com.github.SimpleMobileTools:Simple-Commons:15c753bd01'
implementation 'org.greenrobot:eventbus:3.3.1'
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
implementation 'com.github.tibbi:android-smsmms:4cdacdb701'

View file

@ -12,6 +12,7 @@
<uses-permission android:name="android.provider.Telephony.SMS_RECEIVED" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"

View file

@ -158,6 +158,12 @@ class MainActivity : SimpleActivity() {
handlePermission(PERMISSION_SEND_SMS) {
if (it) {
handlePermission(PERMISSION_READ_CONTACTS) {
handleNotificationPermission { granted ->
if (!granted) {
toast(R.string.no_post_notifications_permissions)
}
}
initMessenger()
bus = EventBus.getDefault()
try {

View file

@ -1,3 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
<path android:fillColor="#FFFFFFFF" android:pathData="M37.49 36.52c-2.31 0-4.18 1.67-4.18 3.7 0 0-0.02 28.94 0 30.86-0.24 6.11 9.91-4.24 13.01-4.56 4.27-0.43 17.34-0.17 24.79-0.38 2.31-0.07 4.2-1.67 4.2-3.7V40.22c0-2.04-1.89-3.7-4.2-3.7zm2.68 7.13h28.16c0.79 0 1.42 0.63 1.42 1.42 0 0.79-0.63 1.42-1.42 1.42l-28.16-0.01c-0.79 0-1.42-0.63-1.42-1.42 0-0.79 0.63-1.42 1.42-1.42zm0.04 6.33h28.16c0.79 0 1.42 0.63 1.42 1.42 0 0.79-0.64 1.42-1.42 1.42l-28.16-0.01c-0.79 0-1.42-0.63-1.42-1.42 0-0.79 0.63-1.42 1.42-1.42zm-0.04 6.31h19.48c0.79 0 1.42 0.64 1.42 1.42 0 0.79-0.63 1.42-1.42 1.42H40.17c-0.79 0-1.42-0.63-1.42-1.42 0-0.79 0.63-1.42 1.42-1.42z"/>
<path android:fillColor="#FFFFFFFF" android:pathData="M38.67 37.81c-2.15 0-3.89 1.55-3.89 3.44 0 0-0.02 26.9 0 28.68-0.22 5.67 9.21-3.94 12.09-4.24 3.97-0.4 16.12-0.16 23.04-0.35 2.15-0.06 3.91-1.55 3.91-3.44V41.25c0-1.89-1.76-3.44-3.91-3.44zm2.5 6.62h26.17c0.73 0 1.32 0.59 1.32 1.32 0 0.73-0.59 1.32-1.32 1.32H41.17c-0.73 0-1.32-0.59-1.32-1.32 0-0.73 0.59-1.32 1.32-1.32zm0.04 5.89h26.17c0.73 0 1.32 0.59 1.32 1.32 0 0.73-0.59 1.32-1.32 1.32l-26.17-0.01c-0.73 0-1.32-0.59-1.32-1.32 0-0.73 0.59-1.32 1.32-1.32zm-0.04 5.87h18.1c0.73 0 1.32 0.59 1.32 1.32 0 0.73-0.59 1.32-1.32 1.32l-18.1-0.01c-0.73 0-1.32-0.59-1.32-1.32 0-0.73 0.59-1.32 1.32-1.32z"/>
</vector>

View file

@ -22,12 +22,12 @@
<string name="compress_error">غير قادر على ضغط الصورة إلى الحجم المحدد</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="zero">and %d other</item>
<item quantity="one">and %d others</item>
<item quantity="two">and %d others</item>
<item quantity="few">and %d others</item>
<item quantity="many">and %d others</item>
<item quantity="other">and %d others</item>
<item quantity="zero">و %d أخرى</item>
<item quantity="one">و %d أخرى</item>
<item quantity="two">و %d أخرى</item>
<item quantity="few">و %d أخرون</item>
<item quantity="many">و %d أخرون</item>
<item quantity="other">و %d أخرى</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">محادثة جديدة</string>

View file

@ -22,9 +22,9 @@
<string name="compress_error">Nepodařilo se komprimovat obrázek na požadovanou velikost</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="one">and %d other</item>
<item quantity="few">and %d others</item>
<item quantity="other">and %d others</item>
<item quantity="one">a %d další</item>
<item quantity="few">a %d další</item>
<item quantity="other">a %d dalších</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">Nová konverzace</string>
@ -79,4 +79,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -34,7 +34,7 @@
<string name="new_message">Neue Nachricht</string>
<string name="mark_as_read">Als gelesen markieren</string>
<string name="mark_as_unread">Als ungelesen markieren</string>
<string name="me">Me</string>
<string name="me">Ich</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Möchtest du wirklich alle Nachrichten dieses Chats löschen\?</string>
<!-- Are you sure you want to delete 5 conversations? -->

View file

@ -22,8 +22,8 @@
<string name="compress_error">Αδυναμία συμπίεσης εικόνας στο επιλεγμένο μέγεθος</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="one">and %d other</item>
<item quantity="other">and %d others</item>
<item quantity="one">και %d άλλος</item>
<item quantity="other">και %d άλλοι</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">Νέα συνομιλία</string>
@ -76,4 +76,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -22,9 +22,9 @@
<string name="compress_error">Impossible de compresser l\'image à la taille sélectionnée</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="one">and %d other</item>
<item quantity="many">and %d others</item>
<item quantity="other">and %d others</item>
<item quantity="one">et %d autre</item>
<item quantity="many">et %d autres</item>
<item quantity="other">et %d autres</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">Nouvelle conversation</string>
@ -35,7 +35,7 @@
<string name="new_message">Nouveau message</string>
<string name="mark_as_read">Marquer comme lu</string>
<string name="mark_as_unread">Marquer comme non lu</string>
<string name="me">Me</string>
<string name="me">Moi</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Voulez-vous vraiment supprimer tous les messages de cette conversation \?</string>
<!-- Are you sure you want to delete 5 conversations? -->
@ -79,4 +79,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -22,9 +22,9 @@
<string name="compress_error">Impossibile comprimere l\'immagine alla dimensione selezionata</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="one">and %d other</item>
<item quantity="many">and %d others</item>
<item quantity="other">and %d others</item>
<item quantity="one">e %d altro</item>
<item quantity="many">e %d altri</item>
<item quantity="other">e %d altri</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">Nuova conversazione</string>
@ -35,7 +35,7 @@
<string name="new_message">Nuovo messaggio</string>
<string name="mark_as_read">Letto</string>
<string name="mark_as_unread">Non letto</string>
<string name="me">Me</string>
<string name="me">Io</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Vuoi davvero eliminare tutti i messaggi di questa conversazione\?</string>
<!-- Are you sure you want to delete 5 conversations? -->
@ -79,4 +79,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -35,7 +35,7 @@
<string name="new_message">Nova mensagem</string>
<string name="mark_as_read">Marcar como Lida</string>
<string name="mark_as_unread">Marcar como Não Lida</string>
<string name="me">Me</string>
<string name="me">Eu</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Tem certeza que quer deletar todas as mensagens dessa conversa\?</string>
<!-- Are you sure you want to delete 5 conversations? -->
@ -79,4 +79,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -35,7 +35,7 @@
<string name="new_message">Nova mensagem</string>
<string name="mark_as_read">Marcar como lida</string>
<string name="mark_as_unread">Marcar como não lida</string>
<string name="me">Me</string>
<string name="me">Eu</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Tem a certeza de que pretende apagar todas as mensagens desta conversa\?</string>
<!-- Are you sure you want to delete 5 conversations? -->
@ -79,4 +79,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -22,9 +22,9 @@
<string name="compress_error">Nu se poate comprima imaginea la dimensiunea selectată</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="one">and %d other</item>
<item quantity="few">and %d others</item>
<item quantity="other">and %d others</item>
<item quantity="one">și %d alt</item>
<item quantity="few">și %d altele</item>
<item quantity="other">și %d de altele</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">Conversaţie nouă</string>
@ -37,7 +37,7 @@
<string name="mark_as_unread">Marchează ca necitit</string>
<string name="me">Me</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Eşti sigur că vrei să ştergi toate mesajele din această conversaţie\?</string>
<string name="delete_whole_conversation_confirmation">Sunteți sigur că doriți să ștergeți toate mesajele din această conversație\?</string>
<!-- Are you sure you want to delete 5 conversations? -->
<plurals name="delete_conversations">
<item quantity="one">%d conversaţie</item>
@ -54,11 +54,11 @@
<string name="lock_screen_visibility">Vizibilitatea notificării pe ecranul de blocare</string>
<string name="sender_and_message">Expeditor şi mesaj</string>
<string name="sender_only">Doar expeditorul</string>
<string name="enable_delivery_reports">Activează rapoartele de livrare</string>
<string name="enable_delivery_reports">Activați rapoartele de livrare</string>
<string name="use_simple_characters">Elimnă accente şi diacritice la trimitearea mesajelor</string>
<string name="mms_file_size_limit">Redimensioneză imaginile trimise prin MMS</string>
<string name="mms_file_size_limit_none">Fără limită</string>
<string name="outgoing_messages">Outgoing messages</string>
<string name="outgoing_messages">Mesaje transmise</string>
<string name="group_message_mms">Trimiteți mesaje de grup ca MMS</string>
<string name="send_long_message_mms">Trimiteți mesaje lungi ca MMS</string>
<!-- Export / Import -->
@ -71,7 +71,7 @@
<string name="import_mms">Importă mesajele MMS</string>
<string name="no_option_selected">Trebuie să selectaţi cel puţin un element</string>
<!-- FAQ -->
<string name="faq_1_title">De ce aplicaţia are nevoie de acces la internet\?</string>
<string name="faq_1_title">De ce aplicația necesită acces la internet\?</string>
<string name="faq_1_text">Din păcate este nevoie pentru a primite ataşamente MMS. Ideea de a nu putea trimite MMS-uri ar prezenta un dezavantaj foarte mare în comparaţie cu alte aplicaţii, aşa că am decis să mergem pe această cale. Totuşi, ca de obicei, nu este prezentă nici un fel de reclamă, urmărire sau analiză, internetul este folosit doar pentru a trimite MMS-uri.</string>
<string name="faq_2_title">Celălalt capăt nu-mi primește MMS, pot face ceva în acest sens\?</string>
<string name="faq_2_text">Dimensiunea MMS este limitată de operatorii de telefonie; puteți încerca să setați o limită mai mică în setările aplicației.</string>
@ -79,4 +79,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -22,10 +22,10 @@
<string name="compress_error">Невозможно сжать изображение до выбранного размера</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="one">and %d other</item>
<item quantity="few">and %d others</item>
<item quantity="many">and %d others</item>
<item quantity="other">and %d others</item>
<item quantity="one">и ещё %d</item>
<item quantity="few">и ещё %d</item>
<item quantity="many">и ещё %d</item>
<item quantity="other">и ещё %d</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">Новая переписка</string>
@ -82,4 +82,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

View file

@ -22,7 +22,7 @@
<string name="compress_error">无法将图像压缩到选定的大小</string>
<!-- vCard-->
<plurals name="and_other_contacts">
<item quantity="other">and %d others</item>
<item quantity="other">及 %d 个其他人</item>
</plurals>
<!-- New conversation -->
<string name="new_conversation">新的对话</string>
@ -33,7 +33,7 @@
<string name="new_message">新消息</string>
<string name="mark_as_read">标记为已读</string>
<string name="mark_as_unread">标记为未读</string>
<string name="me">Me</string>
<string name="me">自己</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">您确定要删除此对话的所有消息吗\?</string>
<!-- Are you sure you want to delete 5 conversations? -->