Commit Graph

779 Commits

Author SHA1 Message Date
Niels Andriesse
ad51bbb847 Update open group guidelines 2021-05-25 16:24:37 +10:00
Niels Andriesse
02bbd3b8bf Clean up onboarding 2021-05-25 11:48:59 +10:00
Niels Andriesse
9fa3e37e68 Update build number 2021-05-25 09:17:28 +10:00
Niels Andriesse
128116ec36 Fix crash 2021-05-25 09:17:06 +10:00
Niels Andriesse
5d9957a57d Fix merge 2021-05-24 16:21:24 +10:00
Niels Andriesse
ba116df195
Merge pull request #554 from RyanRory/fix-open-group-spam
Fix Open Group Notification Spam Part 2
2021-05-24 16:14:25 +10:00
Niels Andriesse
dfce9d636a Update build number 2021-05-24 16:10:51 +10:00
Niels Andriesse
e674e40959 Experimental performance improvement 2021-05-24 16:10:27 +10:00
Niels Andriesse
550d8b61c7 Quick fix crash 2021-05-24 15:31:46 +10:00
ryanzhao
25df4330be Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 14:49:56 +10:00
Niels Andriesse
5353e124df Update translations 2021-05-24 14:46:28 +10:00
Niels Andriesse
2a0a5a2326 Fix case 2021-05-24 14:33:10 +10:00
Niels Andriesse
08a2295f16
Merge pull request #562 from hjubb/pubkey_validation_on_open_group
Validate Public Key When Adding Open Group
2021-05-24 14:32:18 +10:00
jubb
4f84b976c5 fix: return error early if the public key is not expected length or format with an appropriate message 2021-05-24 14:01:20 +10:00
Niels Andriesse
639146cc0a Simplify & fix from_server_id usage 2021-05-24 13:48:01 +10:00
Niels Andriesse
716e768dac Merge branch 'dev' into polling-limit 2021-05-24 13:37:13 +10:00
Niels Andriesse
95657195e6 Update build number 2021-05-24 13:24:35 +10:00
Brice-W
2969d4b161 clean 2021-05-24 13:14:37 +10:00
Brice-W
6c37e7a93f move logic from Storage to OpenGroupAPIV2 2021-05-24 13:13:07 +10:00
Brice-W
1b25de6a96 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 13:00:02 +10:00
Brice-W
becc3c7278 Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity 2021-05-24 12:58:35 +10:00
Niels Andriesse
f64fb68e96
Merge branch 'dev' into fix_hardcoded_strings 2021-05-24 12:52:10 +10:00
Niels Andriesse
b5b3f4aebe
Merge pull request #555 from oxen-io/nicknames
Nicknames
2021-05-24 12:46:44 +10:00
Niels Andriesse
38f50a6dda Fix open group display name handling 2021-05-24 12:44:45 +10:00
Brice-W
dbaa51bd9a implementation of polling limit on open groups 2021-05-24 12:00:17 +10:00
Niels Andriesse
d7afcd07f8 Add contacts migration 2021-05-24 11:35:05 +10:00
Niels Andriesse
04b62df83c Make user details bottom sheet look better 2021-05-24 11:08:08 +10:00
jubb
43b297b334 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-24 10:34:47 +10:00
Niels Andriesse
e7ae08fe7a Clean 2021-05-24 10:27:31 +10:00
ryanzhao
b186d4a670 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 09:19:56 +10:00
Niels Andriesse
051dbbfef9 Update version number 2021-05-24 08:54:38 +10:00
jubb
7c7ace9ecd refactor: extract hardcoded strings
allows fix for #529
2021-05-21 16:49:06 +10:00
Niels Andriesse
dfd3ccc5d2 Clean 2021-05-21 15:56:38 +10:00
Niels Andriesse
c0f894e1b2 Clean 2021-05-21 15:36:16 +10:00
Niels Andriesse
e0c1456af4 Merge branch 'dev' into nicknames 2021-05-21 15:21:24 +10:00
Niels Andriesse
01b86fcc2f Merge branch 'dev' of github.com:oxen-io/session-android into dev 2021-05-21 15:10:49 +10:00
Niels Andriesse
a4a11e8e5e Fix indentation 2021-05-21 15:09:50 +10:00
Niels Andriesse
6302b5d65c
Merge pull request #553 from Brice-W/profile-picture-fix
Fix Home Screen Profile Picture Refreshing
2021-05-21 15:09:18 +10:00
Niels Andriesse
49c3ffd9ca Remove redundant code 2021-05-21 15:02:34 +10:00
Ryan ZHAO
953f6d8c17 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-21 14:55:15 +10:00
Ryan ZHAO
d52787a661 try to use jobs to mark if all open groups are caught up 2021-05-21 14:55:06 +10:00
Brice-W
c90ab52cdf clean 2021-05-21 13:36:21 +10:00
Brice-W
05535983e2 clean 2021-05-21 13:34:44 +10:00
Brice-W
b58e4427dd fix profile picture not updated on home UI 2021-05-21 13:24:49 +10:00
Niels Andriesse
ff96bb05a8 Implement remaining bits and pieces 2021-05-21 11:09:03 +10:00
Niels Andriesse
da331b036e Integrate new closed group poller 2021-05-21 10:30:02 +10:00
Niels Andriesse
6829895995 Handle Kryo version incompatibility 2021-05-21 09:08:16 +10:00
Niels Andriesse
b0f564672b Update build number 2021-05-21 09:04:32 +10:00
Niels Andriesse
79e76ef46b Update build number 2021-05-20 15:56:01 +10:00
Niels Andriesse
31b5cfb4e0
Merge pull request #548 from RyanRory/fix-open-group-spam
Fix Open Group Notification Spam
2021-05-20 15:50:49 +10:00
Niels Andriesse
8e9deba756
Merge pull request #549 from hjubb/fix_deleting_necessary_empty_threads
Don't Auto-Delete Empty Open Groups
2021-05-20 15:50:37 +10:00
Niels Andriesse
b9a7531f58 Clean 2021-05-20 15:44:30 +10:00
jubb
1cc0b0ee7d refactor: don't delete empty threads if they're open groups 2021-05-20 15:43:29 +10:00
Ryan ZHAO
5c39a09d8e Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-20 15:41:25 +10:00
Ryan ZHAO
6822bc461c new approach for batch notification 2021-05-20 15:41:17 +10:00
Niels Andriesse
24aaa4c9ea Merge branch 'dev' 2021-05-20 15:41:16 +10:00
Niels Andriesse
826a11c4b0 Update build number 2021-05-20 15:23:22 +10:00
Niels Andriesse
0d63bc0d44 Delete unsupported language 2021-05-20 15:22:04 +10:00
Niels Andriesse
aca758c9eb Update version number 2021-05-20 15:12:05 +10:00
Ryan ZHAO
b2827184a8 extend the debouncer timeout 2021-05-20 14:43:22 +10:00
Ryan ZHAO
1b52d89059 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-20 14:08:53 +10:00
Ryan ZHAO
f09b203da0 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 14:06:51 +10:00
Ryan ZHAO
563a13d208 fix nickname usage & clean 2021-05-20 14:06:42 +10:00
Niels Andriesse
c580da5dd1 Fix crash 2021-05-20 13:35:43 +10:00
Niels Andriesse
c7d865fb57 Merge branch 'dev' of github.com:oxen-io/session-android into dev 2021-05-20 12:06:41 +10:00
Niels Andriesse
15daf27efd Remove file server instability modal 2021-05-20 12:06:22 +10:00
Ryan ZHAO
ca723a3796 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 12:01:22 +10:00
Ryan ZHAO
30c7a4c1bb fix nickname in group creating & editing 2021-05-20 12:01:08 +10:00
Niels Andriesse
039b667f59
Merge pull request #546 from hjubb/fix_missing_deps
Use Maven Central Instead of Bintray
2021-05-20 11:53:08 +10:00
Ryan ZHAO
38ed5c2187 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 11:15:24 +10:00
Niels Andriesse
baa8538f0e Update version number 2021-05-20 11:00:08 +10:00
nielsandriesse
c861b330ba Add file server instability modal 2021-05-20 11:00:00 +10:00
Ryan ZHAO
8f925a5b52 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-20 09:37:16 +10:00
Niels Andriesse
6ac534482f Update version number 2021-05-20 09:04:55 +10:00
ryanzhao
f13b5ab9d7 fix open group spam 2021-05-19 17:01:53 +10:00
nielsandriesse
747a27ddda Add file server instability modal 2021-05-19 15:25:36 +10:00
Harris
99e6382f2e refactor: use lazysodium version on maven central instead of bintray (no longer available) 2021-05-19 15:12:35 +10:00
nielsandriesse
e79d23c910 Add "Help us Translate Session" button 2021-05-19 13:47:04 +10:00
nielsandriesse
588f9ed8cd Remove entirely untranslated languages 2021-05-19 13:27:08 +10:00
Niels Andriesse
984add5d09
Merge pull request #544 from hjubb/fix_resources
Remove Unused Resources + Updating Translations
2021-05-19 11:28:20 +10:00
nielsandriesse
7ba116c1df Switch to new open group manager 2021-05-19 11:12:29 +10:00
Harris
84e8418d57 Merge remote-tracking branch 'upstream/dev' into origin/fix_resources 2021-05-19 10:57:47 +10:00
nielsandriesse
f8ed7690ca Refactor OpenGroupManager 2021-05-19 10:56:23 +10:00
nielsandriesse
fda66d3f5d Refactor V2 open group poller 2021-05-19 10:03:31 +10:00
nielsandriesse
80c90fa53d Remove incorrectly maintained & unused value 2021-05-19 09:03:49 +10:00
nielsandriesse
2a3d06e485 Fix duplicate message handling 2021-05-19 08:56:44 +10:00
jubb
3acbbc1229 refactor: add latest translations (and repeats) 2021-05-18 16:43:45 +10:00
Niels Andriesse
6243443262 Move files 2021-05-18 16:11:38 +10:00
Niels Andriesse
4078a9c4b5 Move files 2021-05-18 16:03:47 +10:00
Niels Andriesse
ab83e49f93 Remove duplicated/unused code 2021-05-18 15:55:24 +10:00
Niels Andriesse
918e1ea3cf
Merge pull request #542 from Brice-W/error-handling-group-creation
Improved Group Creation Error Handling
2021-05-18 15:05:32 +10:00
Niels Andriesse
68225e00be Clean 2021-05-18 14:45:37 +10:00
Niels Andriesse
7c3bee036c Speed up Gradle sync 2021-05-18 14:18:16 +10:00
Niels Andriesse
8a20c46bd4 Fix missing compile target 2021-05-18 14:08:21 +10:00
jubb
ac198bd705 refactor: add in missing resource and removing broken folders preventing build 2021-05-18 14:05:45 +10:00
Niels Andriesse
cd1171ba84 Clean up app Gradle file 2021-05-18 13:34:40 +10:00
Niels Andriesse
81b0530163 Clean up libsession Gradle file 2021-05-18 13:27:51 +10:00
Niels Andriesse
b0e54d7e9f Update build number 2021-05-18 10:28:30 +10:00
jubb
573760769c Merge remote-tracking branch 'upstream/dev' into fix_resources
# Conflicts:
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-ja/strings.xml
2021-05-18 10:09:26 +10:00
Niels Andriesse
47ff53d559 Remove SignalServiceMessageReceiver 2021-05-18 09:54:16 +10:00
Niels Andriesse
c1548a4e51 Move files 2021-05-18 09:50:16 +10:00
Niels Andriesse
dc8938c269 Move protos 2021-05-18 09:44:06 +10:00
Niels Andriesse
c124f86f6b Move protos 2021-05-18 09:36:20 +10:00
Niels Andriesse
961972a723 Move protos 2021-05-18 09:34:45 +10:00
Niels Andriesse
c9ebcc580f Move files 2021-05-18 09:26:08 +10:00
Niels Andriesse
40d2fd25d9 Move files 2021-05-18 09:21:56 +10:00
Niels Andriesse
ce3b32c03e Move files 2021-05-18 09:17:22 +10:00
Niels Andriesse
a88322a033 Move files 2021-05-18 09:12:33 +10:00
jubb
0f435ca040 refactor: remove more unnecessary strings from libsession's values 2021-05-17 17:29:39 +10:00
Niels Andriesse
77f0a54aec Update version number 2021-05-17 15:49:44 +10:00
Niels Andriesse
e598d73539
Merge pull request #516 from Brice-W/media-saving
Fix Saving Media Files
2021-05-17 15:47:18 +10:00
Niels Andriesse
2172152219
Merge pull request #538 from beantaco/japanese
More Japanese Translations
2021-05-17 15:23:45 +10:00
Niels Andriesse
6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +10:00
Brice-W
059a84f3ce Merge branch 'dev' of https://github.com/loki-project/session-android into error-handling-group-creation 2021-05-17 14:18:09 +10:00
Brice-W
ff50d2f1fd error handling if something goes wrong when creating a group 2021-05-17 14:16:04 +10:00
Niels Andriesse
cf3f0fbe57 Minor refactoring 2021-05-17 13:57:18 +10:00
Niels Andriesse
33e77dde1e Fix group deletion 2021-05-17 13:46:17 +10:00
Niels Andriesse
b248b5c52b Fix build 2021-05-17 13:37:12 +10:00
jubb
eee3824ca0 refactor: running the remove unused resources command and cleaning up strings 2021-05-17 11:56:14 +10:00
Niels Andriesse
11e223f5d8 Merge branch 'dev' into open-group-invitations 2021-05-17 11:42:27 +10:00
Niels Andriesse
9074355b4e Fix attachment pointer conversion 2021-05-17 11:23:49 +10:00
Niels Andriesse
361be28223 Fix group deletion 2021-05-17 10:49:27 +10:00
beantaco
4b225c1456
Add new Japanese translations 2021-05-14 10:26:47 +00:00
beantaco
d61b1c05f0
Fix some Japanese translations
- In message details, "Disappears" (meant as message lifetime) is translated to "寿命" (lifetime).
- Translation of "decentralized" is changed from "分散型" (distributed) to "非中央集中型".
- "Session ID を入力してください" (translation of "Enter Session ID" tab) is too long and was not expressed in command form. -> "Session ID を入力する"
- "パス" (the translation of "path") could be a translation of "pass" and its meaning is ambiguous, so is changed to "経路" (route).
- "お知らせ" (also a translation of "news" and "announcement") is changed to "通知" (notification), making translation of "notification" more consistent.
2021-05-14 10:26:41 +00:00
Niels Andriesse
3e75ed3cc4 Merge branch 'dev' into v2-file-server 2021-05-14 16:19:57 +10:00
Niels Andriesse
92acb50ea7
Merge pull request #537 from hjubb/image_sending_og_fixes
Open Group Image Sending Fixes
2021-05-14 15:58:24 +10:00
jubb
8b5134b9ef fix: fixes the failing insertions possibly composite PK related 2021-05-14 15:55:38 +10:00
Niels Andriesse
3cb2d6c9f4 Update version number 2021-05-14 15:54:07 +10:00
Niels Andriesse
faa8c9443f Hardcode community guidelines 2021-05-14 15:17:16 +10:00
Niels Andriesse
6e5f75d472 Fix build 2021-05-14 13:53:41 +10:00
Niels Andriesse
9699126ac9 Update copy 2021-05-14 13:52:24 +10:00
Niels Andriesse
816e44a7ec Update copy 2021-05-14 13:52:05 +10:00
Niels Andriesse
72540aa787 Cancel jobs when thread is deleted 2021-05-14 13:51:47 +10:00
Niels Andriesse
446ff908ba Clean up RetrieveProfileAvatarJob 2021-05-14 13:51:35 +10:00
Niels Andriesse
43c5fce526 Make chips look better 2021-05-14 13:51:18 +10:00
Niels Andriesse
c9157d33c4 Update copy 2021-05-14 13:31:26 +10:00
Niels Andriesse
2b2756c5e7 Update copy 2021-05-14 13:30:52 +10:00
Niels Andriesse
5eed7a3cdd Clean 2021-05-14 13:13:02 +10:00
Niels Andriesse
ed9d1c7471 Cancel jobs when thread is deleted 2021-05-14 13:09:40 +10:00
Ryan ZHAO
c82a76b912 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-14 11:04:36 +10:00
Ryan ZHAO
c4cd74fca0 fix icons in bottom sheets don't follow the theme color 2021-05-14 11:04:28 +10:00
Niels Andriesse
88b4388e06 Clean up RetrieveProfileAvatarJob 2021-05-14 10:56:47 +10:00
Brice-W
f5a99b43c7 Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations 2021-05-14 10:32:12 +10:00
Brice-W
8dd606cbb3 join open group code executed in a coroutine so it's not blocking the UI 2021-05-14 10:26:38 +10:00
Niels Andriesse
133bcac17c Make chips look better 2021-05-14 10:09:12 +10:00
Niels Andriesse
54b93e56a0 Update version number 2021-05-14 08:58:11 +10:00
Niels Andriesse
61c210837e Clean 2021-05-14 08:56:25 +10:00
Ryan ZHAO
1d5f7957ab clean 2021-05-13 16:20:55 +10:00
Niels Andriesse
a2c886468d Clean 2021-05-13 16:14:54 +10:00
Brice-W
b562aa5738 set notification text 2021-05-13 15:59:24 +10:00