Commit Graph

364 Commits

Author SHA1 Message Date
adbenitez 8f08fa92d0 update welcome message 2021-04-07 04:00:12 -04:00
adbenitez 4f49bc2180 add device messages 2021-04-07 03:43:29 -04:00
adbenitez b711b44efa Merge remote-tracking branch 'upstream/master' 2021-03-15 04:38:31 -04:00
adbenitez 7b6f1bd507 add lock recording feature 2021-03-14 15:28:23 +01:00
adbenitez 7228413088 Merge remote-tracking branch 'upstream/master' 2021-02-10 14:33:26 -05:00
B. Petersen 406bb9a6ee update translations 2021-02-10 15:54:55 +01:00
B. Petersen 097da7c165 show name of forwarded in groups, keep title of forwarded messages in grey 2021-02-10 15:50:10 +01:00
adbenitez 0777ffc503 Merge remote-tracking branch 'upstream/master' 2021-02-07 23:31:00 -05:00
B. Petersen c14a864bf0 update translations 2021-02-07 23:51:39 +01:00
bjoern c814885f5c mailinglists3 (#1781)
* Adapt to mailing lists

* Change the question if this is a mailing list (untested)

* rm unused fn

* Adapt to getSenderName -> getOverrideSenderName (untested)

* Use dc_msg_get_sender_first_name() because sometimes the first name was not correctly shown in mailing lists

* Don't let the user modify mailing list groups

* Fix crash

* Make Unnamed newsletter translatable, make the subtitle of mailing lists "Mailing list"

* tweak and hide some controls for mailing lists

* Update src/com/b44t/messenger/DcChat.java

Co-authored-by: bjoern <r10s@b44t.com>

* adapt to new dc_msg_get_real_chat() api, remove dc_msg_get_sender_first_name()

* remove now dead code

* add mailing list name to contact-request-question

move question-creation to a helper class
to avoid duplicated code.

* fix DcMsg.getOverrideSenderName()

* adapt to new dc_decide_on_contact_request() api

* re-allow changing name+image for mailinglists, see recent discussions on PRs

* remove memberlist- and settings-tab from mailinglist profile until there is some use for them

* adapt to new DC_CHAT_TYPE_MAILINGLIST type

Co-authored-by: Hocuri <hocuri@gmx.de>
2021-02-07 23:39:48 +01:00
adbenitez 96271b367e Merge remote-tracking branch 'upstream/master' 2021-02-07 15:13:44 -05:00
B. Petersen f03c8a5062 update translations 2021-02-03 13:55:01 +01:00
link2xt 9e610e5d4b Replace 4 weeks option with 5 weeks option
While 4 weeks always fits in a month,
5 weeks (35 days) always covers at least a month,
so it can be used in a situation where messages are required to
be stored for a month.
2021-02-03 13:34:05 +03:00
adbenitez c9e5d216f0 Merge remote-tracking branch 'upstream/master' 2021-01-31 02:32:52 -05:00
link2xt f155757cee Change list of ephemeral message options
Also match unknown options to some known option, not "disabled".
2021-01-31 00:45:13 +03:00
bjoern 8d9c02dd7a add option to view full (html) message (#1763)
* add get-mime-original apis

* remove unused control

* add 'Show full message' buttons

* split reusable WebViewActivity from LocalHelpActivity

* add FullMsgActivity

* load html via AsyncTask

* adapt to changed api

* handle mailto:-links in WebView

* block loading remote images by default, add user setting always/once/never

* do not hide 'Once' button in always-mode, playing around a day with hidden 'Once' that looks more like a bug :)

* wording: as 'Always' affects all messages, it is better to speak of multiple senders

* wording: use 'Load remote images'

this makes it easier for the user to find the option
if one sees, images are missing in the document.

* wording: shorten text.

* wording: change 'may' to 'can'. 'may' sounds a bit as if someone allows this.

* Don't use AsyncTask

* check 'once' if appropriate

* use lite-colored checkbox-emoji in dark-theme

* add comment about missing error logging

Co-authored-by: Hocuri <hocuri@gmx.de>
2021-01-28 22:53:15 +01:00
adbenitez 1a3cc4519f Merge branch 'lite' 2021-01-22 17:31:28 -05:00
adbenitez ef39faeb4c Merge remote-tracking branch 'upstream/master' into lite 2021-01-22 17:30:28 -05:00
B. Petersen 3a7443a91d update translations 2021-01-22 22:40:38 +01:00
adbenitez 9ec005de09 Merge remote-tracking branch 'upstream/master' into lite 2021-01-10 23:44:07 -05:00
adbenitez ee75dfedfe Merge remote-tracking branch 'upstream/master' 2020-12-31 13:12:31 -05:00
Hocuri 1ff6a3a18d Dark theme / DayNight: Add option to follow system
fix maybe #1748. Maybe not, because actually I don't understand why
issue #1748 even happened because we don't use the system background for
the bubble but an own one (see conversation_item_sent.xml:50). Probably
the system is somehow trying to forcefully create a dark mode.

So, let's see whether this PR fixes the issue, if not, I'll try again.
2020-12-19 19:51:55 +01:00
adbenitez 0dc7571848 remove old code 2020-12-06 13:00:37 -05:00
adbenitez 7fe3db1294 Merge remote-tracking branch 'upstream/master' 2020-12-06 08:15:28 -05:00
adbenitez 65a15ed556 Merge remote-tracking branch 'upstream/master' into lite 2020-12-03 16:13:56 -05:00
B. Petersen b284a70ef7 reword no-blocked-contats-hint 2020-11-22 23:06:00 +01:00
adbenitez aec3b64967 Merge remote-tracking branch 'upstream/master' into lite 2020-11-21 23:59:19 -05:00
B. Petersen 4362bb07d0 update translations 2020-11-20 13:19:12 +01:00
adbenitez 7b0adee9ae Merge remote-tracking branch 'upstream/master' into lite 2020-11-19 22:22:13 -05:00
B. Petersen 8e185e4f26 show permanent hint about server-delete impact
when server-deletion is enabled,
always show a hint about the impact below the option.

the hint is a summary of the conformation-dialog
so that the user is more aware of the impact
if enabling was some time ago
or the option was even enabled by the provider-db.
2020-11-18 21:54:39 +01:00
B. Petersen 8675a21e64 fix grammar 2020-11-18 11:32:35 +01:00
B. Petersen 4b3355813d incorporate some of @Hocuri's suggestions 2020-11-17 23:39:16 +01:00
B. Petersen 21faaa5f9c fortify wording in delete-server dialog
this pr changes the wording,
not relativize things, underlining the worse impact.

i avoided adding "maybe" or "potentially" here,
even if that would be more accurate.

moreover, the pr adds some red color and emojicons.
2020-11-17 16:35:50 +01:00
adbenitez 99d1b391f6 Merge remote-tracking branch 'upstream/master' into lite 2020-11-01 00:07:21 -04:00
bjoern 4316354163 Update res/values/strings.xml
Co-authored-by: link2xt <ilabdsf@gmail.com>
2020-11-01 01:24:59 +01:00
B. Petersen 8e724e8a76 update changelog, add device message for 1.14 2020-11-01 01:24:58 +01:00
adbenitez e494f4733a Merge remote-tracking branch 'upstream/master' into lite 2020-10-26 13:39:21 -04:00
B. Petersen 8bd280f44b update translations 2020-10-25 17:02:56 +01:00
adbenitez 8f68944642 Merge remote-tracking branch 'upstream/master' into lite 2020-10-21 14:12:00 -04:00
B. Petersen 6f25349572 placeholders in strings need to be uniquely adressable, more than one %s needs to be %1, %2 and so on 2020-10-21 14:26:28 +02:00
adbenitez bc3f3be0ba Merge remote-tracking branch 'upstream/master' into lite 2020-10-18 16:46:17 -04:00
B. Petersen b8099e8107 reword protection message and make it translatable 2020-10-18 13:13:11 +02:00
B. Petersen 6e9ff3033a use string 'Delete contact' to delete contacts 2020-10-17 01:40:36 +02:00
adbenitez 7434361ff0 Merge remote-tracking branch 'upstream/master' into lite 2020-10-16 16:27:08 -04:00
Hocuri 810f1d0e01 Sort strings to the correct place 2020-10-16 18:51:59 +02:00
adbenitez 6d658faf78 Merge remote-tracking branch 'upstream/master' into lite 2020-10-15 23:47:00 -04:00
B. Petersen 9ba23ed977 wording: use 'profile image' and 'group image' everywhere 2020-10-15 21:26:47 +02:00
Simon Laux d00d4fd152 add translation strings from desktop (#1658)
* add strings from desktop

* update wording

* escape ampersands

* reorder menu to clipboard

* remove back_to_top

* group avatar to group image

Co-authored-by: bjoern <r10s@b44t.com>

* remove default_value_automatic

* rename ask_delete_chat_desktop to dedup to
ask_delete_named_chat_desktop

* rename desktop delete accounts strings
delete_account_confirmation_header_desktop -> ask_delete_value
delete_account_confirmation_desktop -> delete_account_explain_with_name

* apply Hocuri's suggestion
on delete_account_confirmation_desktop

* reuse existing strings for zoom factor

* capitalize "Micro"

* remove usused a11y_qr_data

* profile_image_select and delete

Co-authored-by: bjoern <r10s@b44t.com>

* lowercase clipboard

* Cannot in one word

* shorten delete_account_confirmation_header_desktop
upon r10s suggestion

* remove a11y_profile_image_label
as we can use pref_profile_photo instead

* apply hocuri's pref_notification suggestions

* Apply suggestions from code review

Co-authored-by: Hocuri <hocuri@gmx.de>

* readd removed string that android still uses it

* remove common things out of _desktop namespace, typo fixes, ordering

* typo

* typo

Co-authored-by: bjoern <r10s@b44t.com>
Co-authored-by: Hocuri <hocuri@gmx.de>
2020-10-15 19:04:55 +02:00
B. Petersen 581580a2d5 fixup 2020-10-15 01:06:19 +02:00
B. Petersen f424f49c20 make new stock-strings translatable 2020-10-15 01:04:34 +02:00