mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-28 20:08:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
11508 commits 7 branches 124 tags 230 MiB
Commit graph

620 commits

Author SHA1 Message Date
Onuray Sahin
d54571d0a6 Emoji library added with Google style. 2020-12-09 18:45:33 +03:00
ganfra
76ed775f6f VoIP: start to show in-app notification 2020-12-09 11:17:49 +01:00
SpiritCroc
3defe44eff Increment version 
Change-Id: Ic7a599e412c312fb5489500d2eb7ee1808a0b6bb
 2020-12-05 11:02:41 +01:00
ganfra
efec711ced Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-03 13:01:54 +01:00
Benoit Marty
c4577f28b2 Remove unnecessary dependency (we have -ktx dependency) 2020-12-02 16:43:52 +01:00
Benoit Marty
89a7ec6d4b Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable) 2020-12-02 12:46:15 +01:00
Benoit Marty
42bc4d2445 Upgrade some dependencies and Kotlin version 2020-12-02 12:09:56 +01:00
ganfra
4a3f0c8898 VoIP: update in call ui (blur) 2020-12-01 18:36:00 +01:00
SpiritCroc
0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
 2020-11-29 12:51:43 +01:00
Benoit Marty
b84d7f0834 Version** 2020-11-27 20:42:02 +01:00
SpiritCroc
ac89fb97f8 Increment version 
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
 2020-11-24 16:13:49 +01:00
Benoit Marty
07c805a019 Create sanity test with all screens path 
Introduce `com.schibsted.spain:barista`
 2020-11-09 16:56:20 +01:00
SpiritCroc
164848e0aa Increment version 
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
 2020-11-07 11:37:55 +01:00
SpiritCroc
58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
Benoit Marty
17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
SpiritCroc
07e6cf2a8d Increment version 
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
 2020-11-02 13:20:05 +01:00
Benoit Marty
60556d0fa0 Version code: apply workaround from https://issuetracker.google.com/issues/171133218 2020-10-22 16:10:08 +02:00
Benoit Marty
c05147a019 Merge branch 'hotfix/bma/versionCode' into develop 2020-10-19 12:31:35 +02:00
Benoit Marty
a59c92f55a Fix issue with VersionCode 2020-10-19 12:29:20 +02:00
SpiritCroc
5853709c97 Increment version 
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
 2020-10-17 17:05:03 +02:00
SpiritCroc
44d3c0118a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/view_avatar_selector.xml
 2020-10-17 15:28:18 +02:00
Benoit Marty
1b7158a61d Version++ 2020-10-16 17:34:10 +02:00
ganfra
9bf615e90c Fix composer: update constraints layout and fix some glitches 2020-10-16 11:24:59 +02:00
SpiritCroc
ca60a769d2 Increment version 
Change-Id: I7ffc24a91c8960d0fdbba2881dc887bb09e43721
 2020-10-13 15:42:19 +02:00
Constantin Wartenburger
7e5ee8f951
Made it backwards compatible 2020-10-11 22:09:19 +02:00
Benoit Marty
9e0ebc94c5 Upgrade other dependencies, and remove unused dependencies 2020-10-06 15:44:30 +02:00
Benoit Marty
1a0dba7422 Upgrade Moshi to 1.11.0, Dagger to 2.29.1, Epoxy to 4.1.0 2020-10-06 14:47:57 +02:00
Benoit Marty
5056615eb0 Upgrade kotlin version from 1.3.72 to 1.4.10 and kotlin coroutines version from 1.3.8 to 1.3.9 2020-10-06 12:33:40 +02:00
SpiritCroc
96aa885819 Increment version 
Change-Id: I68a3f7a7806795a2f5ae7a1b582bb6d9e572872b
 2020-09-30 12:23:15 +02:00
Valere
2908a5d345 Added first ui bootstrap test 2020-09-30 10:13:59 +02:00
Benoit Marty
487bbe42a9
Merge branch 'develop' into feature/ui_test 2020-09-29 16:13:44 +02:00
ganfra
8bc0afa75e Timeline: add glide preloading 2020-09-29 15:42:21 +02:00
Benoit Marty
b14d22550b PR Review 
Cleanup and Add command line to run the UI tests
 2020-09-29 15:12:25 +02:00
Valere
bc2c345e21 First automated UI tests 2020-09-29 12:51:27 +02:00
SpiritCroc
1cc4c7177f Increment version 
Change-Id: I1f2ddbb0e8ff82db6f3f321dc073f29426e8d5ac
 2020-09-27 14:11:52 +02:00
SpiritCroc
43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
 2020-09-27 13:55:40 +02:00
Benoit Marty
6958d114a9 Version++ 2020-09-25 14:09:25 +02:00
Benoit Marty
f271968238 Upgrade library PFLockScreen-Android 2020-09-24 08:20:17 +02:00
SpiritCroc
7bdc4c30ec Increment version 
Change-Id: I1c958f87747b78f856a7a6ad502a4ebc75f4af05
 2020-09-22 10:22:29 +02:00
SpiritCroc
2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-09-17 12:03:17 +02:00
Benoit Marty
216138394f Version++ 2020-09-17 09:32:35 +02:00
SpiritCroc
cf24ca90f9 Increment version 
Change-Id: Ice9536342a8eeff003019350a07e27f805426562
 2020-09-10 18:14:11 +02:00
SpiritCroc
1d7681a893 Don't do ABI extra versioning 
Doesn't work with F-Droid automatic update detection

Change-Id: I6bafe05f151e240fee37cd714ab2ac076a7a1a69
 2020-09-10 18:14:06 +02:00
ganfra
c2880a5832 Strict mode: add a build entry to enable whenever we want to check 2020-09-09 11:52:05 +02:00
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
Benoit Marty
bf0b6d738a Version++ 2020-09-08 17:49:26 +02:00
SpiritCroc
372ae6e162 Increment version 
Change-Id: I7de06d933fdddf3b4cd05538f0c5b3f29066b6c8
 2020-09-02 11:58:48 +02:00
Valere
9d2ea19d7d Upgrade to worker 2.4.0 2020-08-31 16:20:12 +02:00
Benoit Marty
59fa2e28c2 Fix sonar analysis version name issue 2020-08-27 18:15:53 +02:00
Onuray Sahin
776d892d27 Increase version of uCrop library which supports Android 10. 2020-08-26 12:27:12 +03:00
SpiritCroc
c7ae49df1b Increment version 
Change-Id: I2e30e69f149fa363d8a0391fd4c4682575a234ae
 2020-08-24 17:54:08 +02:00
SpiritCroc
3b23ed9830 Increment version 
Change-Id: Ia0033b834c7b1a9145ead4247fe70d427ef53ae9
 2020-08-24 15:56:04 +02:00
SpiritCroc
4dfdfba42c Increment version 
Change-Id: I2b9b613775e1698a9b4339e153eb9b677f0898c7
 2020-08-24 11:35:41 +02:00
Benoit Marty
328dc9ea5b
Merge pull request #1979 from vector-im/feature/update_dependencies 
Update some dependencies, including coroutines for working debugging
 2020-08-24 10:11:57 +02:00
SpiritCroc
5b5cfa5bf1 Increment version 2020-08-23 15:27:39 +02:00
SpiritCroc
7b4b5be759 Merge tag 'v1.0.5' into sc 
Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml
 2020-08-22 11:23:45 +02:00
SpiritCroc
c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc 
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
 2020-08-22 09:52:54 +02:00
ganfra
1f890324b4 Update some dependencies, including coroutines for working debugging 2020-08-21 17:17:51 +02:00
Benoit Marty
04fa7d9628 Version++ 2020-08-21 17:04:05 +02:00
Benoit Marty
4cba1388f9 Add support for biometrics (not only Fingerprint) 2020-08-20 14:11:23 +02:00
SpiritCroc
72faa81e2a Increment version 2020-08-18 15:17:34 +02:00
Benoit Marty
05ecbf0f86 Build Jitsi lib version android-sdk-2.9.3, commit abcbbbea12e3ef88012b14723bb8cd42dbefc988 
And host it in https://github.com/vector-im/jitsi_libre_maven/tree/master/android-sdk-2.9.3
 2020-08-14 21:33:25 +02:00
SpiritCroc
17430b06a2 Increment version 2020-08-14 10:45:38 +02:00
Valere
42a24300a1 Initial commit jitsi 2020-08-14 09:31:24 +02:00
SpiritCroc
2a5342087d gplay version: ignore branch for version suffix 2020-08-09 17:02:17 +02:00
SpiritCroc
8602aba2a5 Increment version 2020-08-09 16:41:50 +02:00
SpiritCroc
459e20aac9 Merge tag 'v1.0.4' into sc 2020-08-07 12:34:18 +02:00
Valere
33f6e7e337 Version ++ 2020-08-03 14:04:31 +02:00
Valere
db6045778e Update change log 2020-08-03 12:11:50 +02:00
ganfra
995c552f2a
Merge branch 'develop' into feature/pin_code 2020-07-31 11:41:42 +02:00
SpiritCroc
9f7bf14a22 Merge tag 'v1.0.3' into sc 
1.0.3

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/values/styles_login.xml
 2020-07-31 11:22:57 +02:00
Valere
531623178a Version ++ 2020-07-31 00:52:22 +02:00
ganfra
eb0d350097 Merge branch 'develop' into feature/pin_code 2020-07-30 17:24:48 +02:00
Valere
b732ea6c69 Version ++ 2020-07-29 11:39:23 +02:00
Valere
9197275343 version++ 2020-07-29 09:00:29 +02:00
ganfra
ecdef52829 Continue PIN code library integration (fork required) 2020-07-28 20:22:59 +02:00
SpiritCroc
adaed3fd64 Increment version 2020-07-28 13:55:09 +02:00
SpiritCroc
6170800f9c Increment version 2020-07-24 12:10:03 +02:00
SpiritCroc
af7cbeea11 Increment version 2020-07-20 16:46:11 +02:00
SpiritCroc
fea41d3901 Increment version 2020-07-20 15:55:18 +02:00
SpiritCroc
95850440bd Merge remote-tracking branch 'upstream/master' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/res/drawable/bg_login_server.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
 2020-07-17 13:39:52 +02:00
ganfra
f5fbb2bc4f Setup screens for Pin 2020-07-17 13:29:18 +02:00
SpiritCroc
e37769aae4 SchildiChat 2020-07-17 11:35:40 +02:00
Benoit Marty
53f0b77fb0 Version++ 2020-07-15 14:32:15 +02:00
Benoit Marty
7651eb5c3c Revert "Temporary remove the _dev suffix added to version" 
This reverts commit 7237ec7310.
 2020-07-15 14:14:44 +02:00
Benoit Marty
7237ec7310 Temporary remove the _dev suffix added to version 2020-07-13 21:50:26 +02:00
Onuray Sahin
797dcdb48b Merge branch 'riotx_develop' into rebranding_rebase 
* riotx_develop: (111 commits)
  Video calls are shown as a voice ones in the timeline (Fixes #1676)
  Fix regression: not able to create a room without IS configured (Fixes #1679)
  Fix / view attachment crash + freeze when offline
  Version++
  Prepare release 0.91.5
  Fix test compilation issue
  Fix crash after rebase
  Add TODO
  Copy Javadoc to the API class
  Move internal methods to internal task
  Latest renaming
  Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity
  Rename CreateRoomParamsBuilder to CreateRoomParams for clarity
  Rename internal class
  Expose other objects in the builder to create a room
  ktlint
  Display threePid invite along with the other invite (code is a bit dirty)
  Hide right arrow if threepid invite can not be revoked
  Disable fetching Msisdn, it does not work
  Revoke ThreePid invitation (#548)
  ...

# Conflicts:
#	vector/build.gradle
#	vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
#	vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
#	vector/src/main/res/values/strings.xml
 2020-07-13 19:59:20 +03:00
Benoit Marty
5063188b25 Version++ 2020-07-11 23:00:16 +02:00
ganfra
3fc9fe3017 Merge branch 'develop' into feature/fix_small_issues 2020-07-10 20:13:47 +02:00
Onuray Sahin
93fe00a299 Merge branch 'develop' into rebranding_rebase 
* develop: (123 commits)
  Fixes #1647 share not working
  Put xmx to 2048m
  Update changelog after PR merged
  Version++
  Prepare release 0.91.04-beta
  Add the new value to the ViewEvent, because the state is maybe not up to date.
  Fix lint error, following the upgrade of the libs
  Revert to gradle build 3.5.3
  Clean code
  Fix leaving selected group
  QuickFix / crash when  starting in airplane mode
  Group: rework a bit how and when we fetch data about groups
  EventInsert: add InsertType to avoid trying to process events we shouldn't
  Upload device keys only once to the homeserver and fix crash when no network (#1629)
  Upgrade some dependencies
  Add a delay to avoid crash. Sounds like a workaround...
  Handle certificate error in case of Direct Login
  Handle JobCancellationException
  Simplify the server selection screen: remove the "Continue" button
  Re-activate Wellknown support with updated UI (#1614)
  ...

# Conflicts:
#	vector/build.gradle
#	vector/src/main/res/values/strings.xml
 2020-07-10 13:05:52 +03:00
Valere
4a2a6d34ae Initial commit 2020-07-08 20:09:55 +02:00
ganfra
0855806ae2 Fix edit being stuck 2020-07-07 22:14:11 +02:00
Benoit Marty
b7d86c3fa4
Merge branch 'develop' into feature/some_upgrade 2020-07-06 23:38:26 +02:00
Benoit Marty
89506b9e81 Version++ 2020-07-06 23:36:14 +02:00
Benoit Marty
9d4e903c4a Upgrade some dependencies 2020-07-06 15:59:49 +02:00
Benoit Marty
d4050a7b9d Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use 2020-07-02 23:39:42 +02:00
Benoit Marty
93fb40f323 (re-)Enable abortOnError for lint 
And fix a first issue (on unused code)
 2020-07-02 11:29:00 +02:00
Benoit Marty
f4314ebdae Version++ 2020-07-01 21:58:58 +02:00
Benoit Marty
3e97e03ccc Prepare release Riot.imX v0.91.3 for the beta channel 2020-07-01 21:51:30 +02:00
Onuray Sahin
cba9109206 Rename the application. 2020-06-30 14:52:50 +03:00
Onuray Sahin
482621e86f Set versionName to 1.0.0 2020-06-30 14:34:02 +03:00
Benoit Marty
0ad2058a1a Prepare version 0.91.2-beta 2020-06-28 23:05:47 +02:00
Benoit Marty
d436a7bad7 Increment version patch for a new release on the PlayStore 2020-06-27 00:14:32 +02:00
Benoit Marty
16a275529d Use temporary name Riot.imX 2020-06-27 00:14:32 +02:00
Benoit Marty
1c9907c5d2 Do not abort on error during lint check. 2020-06-26 21:08:41 +02:00
Benoit Marty
6bce62a598 Update version code to 40_091_00x to upgrade Riot-Android 2020-06-26 16:19:05 +02:00
Benoit Marty
629c73e630 Change applicationId from "im.vector.riotx" to "im.vector.app" 2020-06-26 16:19:05 +02:00
Valere
dc19652c2b WIP 
refact WIP


TMP


WIP
 2020-06-19 13:35:38 +02:00
SpiritCroc
b048a27a85 Increment version 2020-06-18 19:50:57 +02:00
Benoit Marty
f532d28fb3 Min SDK level set to 21 (#405) 2020-06-18 14:18:40 +02:00
Benoit Marty
ff39b22686 Add changelog entry for proguard 2020-06-16 11:18:33 +02:00
Benoit Marty
601e11980f
Merge pull request #1478 from vector-im/feature/proguard 
Feature/proguard
 2020-06-16 11:15:21 +02:00
Benoit Marty
914bfb105c Version++ 2020-06-15 23:28:57 +02:00
SpiritCroc
0ba49f5596 Merge remote-tracking branch 'upstream/develop' into sc 2020-06-15 15:50:57 +02:00
Benoit Marty
ade1f1b911
Merge pull request #1479 from vector-im/feature/memory_leaks 
Feature/memory leaks
 2020-06-15 14:47:16 +02:00
ganfra
c382f706a6 Leaks: disable leakcanary 2020-06-11 19:40:46 +02:00
ganfra
23cbed310a Proguard: activate it in release 2020-06-11 19:37:20 +02:00
ganfra
579d4f7a5b Merge branch 'develop' into feature/power_level 2020-06-10 17:21:04 +02:00
ganfra
d6329a1ab6 Start looking at memory leaks 2020-06-08 19:46:55 +02:00
SpiritCroc
c9a5dc5634 Increment version 2020-06-06 10:34:15 +02:00
SpiritCroc
933a79527c Increment version 2020-06-06 10:08:32 +02:00
ganfra
86dd8f3fd8 Update epoxy to last stable version 2020-06-05 20:14:36 +02:00
SpiritCroc
8cf2a51588 Merge tag 'v0.21.0' into sc 
Conflicts:
	vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
 2020-06-05 16:28:18 +02:00
Benoit Marty
d70b19fa93 SSO login is now performed in the default browser (#1400) - WIP 
Use ChromeCustomTabs to host the SSO web page
 2020-06-05 01:14:35 +02:00
SpiritCroc
761580c930 Increment version 2020-05-29 15:01:10 +02:00
SpiritCroc
3b5c092759 Increment version 2020-05-28 11:12:28 +02:00
Benoit Marty
b0a6eaaa96 Version++ 2020-05-28 10:45:58 +02:00
SpiritCroc
c755c5de0a Merge tag 'v0.20.0' into sc 2020-05-28 09:26:11 +02:00
Benoit Marty
f0f3e8ddb9 Uploads: auto-review 2020-05-25 17:05:17 +02:00
Benoit Marty
0992e76800 Uploads: add screen - WIP 2020-05-25 16:54:08 +02:00
SpiritCroc
81ac31a044 Add own versioning 2020-05-16 12:37:56 +02:00
Benoit Marty
48e58967b2 Version++ 2020-05-15 15:48:15 +02:00
SpiritCroc
ce48360022 Increase minSdk to 21 
Allows to more easily use new mechanisms added in SDK 21.
Additionally, sdk 19 is not supported either way:
Caused by: java.lang.IllegalStateException: Expected Android API level 21+ but was 19
	at okhttp3.internal.platform.AndroidPlatform.<clinit>(AndroidPlatform.kt:232)
 2020-05-14 15:42:27 +02:00
SpiritCroc
f13a647a4b Rebrand 2020-05-12 16:03:33 +02:00
Benoit Marty
6843ea113b Version++ 2020-05-04 16:06:41 +02:00
Benoit Marty
9c8ff7de7f Add Android test for EmojiDataSource 2020-04-28 14:15:50 +02:00
Onuray Sahin
8a4a288074
Merge branch 'develop' into feature/target-sdk-29 2020-04-08 14:15:02 +03:00
Valere
6474735662 Fix / devtools was not showing all json numbers 2020-04-03 10:31:44 +02:00
onurays
12429d8091 Merge develop into the branch. 2020-03-26 14:39:50 +03:00
Onuray Sahin
3bb5e127d6
Merge pull request #1155 from vector-im/feature/multipicker 
Multiple attachment picker implementation
 2020-03-26 14:30:02 +03:00
onurays
c63f3edb06 Initial fixes to support targetSdk 29. 2020-03-26 12:06:50 +03:00
Valere
b56a41bec7 Custom alert design 2020-03-24 14:56:57 +01:00
onurays
f7fd23b153 App integration to the new multipicker library. 2020-03-23 16:31:32 +03:00
onurays
6db0de321c Initial implementation of multipicker. 2020-03-20 12:12:59 +03:00
Valere
d3d6d44665 Post rebase fix 2020-03-17 14:40:05 +01:00
Valere
fc6225a7ac Gossiping refactoring 2020-03-17 14:40:05 +01:00
Valere
20dbe2dd0d version ++ 2020-03-17 14:18:08 +01:00
Valere
78d90c8f04 prepare release 0.18.1 2020-03-17 11:46:42 +01:00
Valere
54eca7525e Version ++ 2020-03-11 16:24:49 +01:00
onurays
05683967c0 Code review fixes. 2020-03-06 12:07:38 +01:00
Benoit Marty
9bb4c7ed25 Version++ 2020-02-27 12:34:33 +01:00
Benoit Marty
f8276e48e3 add kluent for test 2020-02-18 14:09:42 +01:00
Benoit Marty
13d3aa9ff1
Merge branch 'develop' into feature/attachment_process 2020-02-17 13:48:21 +01:00
Benoit Marty
db19ab0531
Merge branch 'develop' into feature/4s_msc1946 2020-02-14 17:45:44 +01:00
Benoit Marty
1660a0f846 Version++ 2020-02-14 15:16:00 +01:00
Valere
61ea4191dc Update json viewer lib 2020-02-14 10:48:18 +01:00
Valere
bf06b57bad Refactor Account Data 
Auto stash before rebase of "develop"
 2020-02-14 10:48:18 +01:00
Ganard
a26e959430 Attachements: introduce structure for preview, cropping and compressing 2020-02-13 19:51:20 +01:00
Benoit Marty
a7274b9df0 Version++ 2020-02-10 21:41:59 +01:00
Ganard
e6cd8a3a86 Merge develop into feature/stabilization_2 2020-02-03 13:59:20 +01:00
Benoit Marty
5fb4f274f9 Version ++ 2020-02-02 08:00:57 +01:00
Benoit Marty
435d8cbc55 Prepare v0.14.1 2020-02-02 07:55:46 +01:00
Benoit Marty
9e15891053 Version++ 2020-02-01 17:21:41 +01:00
Benoit Marty
53e36dca9c ZXing 3.3.3 because of https://github.com/zxing/zxing/issues/1170 2020-02-01 13:52:33 +01:00
Ganard
ec6d78bf96 Merge branch 'develop' into feature/stabilization_2 2020-01-31 15:47:33 +01:00
ganfra
9fc3fa7f19 Update some libs and remove incremental from dagger 2020-01-29 21:14:38 +01:00
Valere
109ff4f908 Merge branch 'cross_signing' into xsigning_sdk 2020-01-28 11:33:54 +01:00
Benoit Marty
c1259161e5 QRCode: generate and scan QRCodes 2020-01-22 15:03:56 +01:00
Benoit Marty
dca950140d
Merge branch 'develop' into feature/version_name 2020-01-22 11:45:27 +01:00
Benoit Marty
f5e6b4b857 F-Droid: fix the "-dev" issue in version name (#815) 2020-01-20 16:08:57 +01:00
Benoit Marty
8c32796d5c Ensure builds are reproducible (#842) 2020-01-17 16:06:58 +01:00
Benoit Marty
d1699279fe Version++ 2020-01-17 14:25:25 +01:00
Benoit Marty
717965bc37 Update comment 2020-01-13 15:12:39 +01:00
Benoit Marty
03b5b098c7 Change the way versionCode is computed (#827) 2020-01-10 17:29:34 +01:00
Benoit Marty
8c9c65837d Version++ 2020-01-09 15:32:37 +01:00
ganfra
8c4d8763a2 Merge branch 'develop' into feature/stabilization 2020-01-08 22:28:08 +01:00
Benoit Marty
d662b4a9b4 Exclude play-services-oss-licenses library from F-Droid build (#814) 2020-01-08 15:57:35 +01:00
ganfra
99c523b710 Update libs 2020-01-06 18:43:34 +01:00
ganfra
6ad914154a Update some libs 2019-12-30 10:46:25 +01:00
Benoit Marty
51d6b8828d Version++ 2019-12-19 16:46:01 +01:00
Benoit Marty
9d26ba3186 Fix rendering issue with HTML formatted body 2019-12-18 12:33:51 +01:00
Benoit Marty
cfee6a43fd
Merge pull request #760 from vector-im/feature/diff_match_patch_submodule 
Use diff_match_patch sources as dependency
 2019-12-16 15:02:29 +01:00
Benoit Marty
853518fbb2 Version++ 2019-12-11 18:34:06 +01:00
Valere
0b93f34fa0 Use diff_match_patch sources as dependency 2019-12-11 10:51:09 +01:00
Benoit Marty
4234c27af9 Version++ 2019-12-05 18:19:20 +01:00
Benoit Marty
6d8850b3d6 Prepare version 0.9.1 2019-12-05 18:17:36 +01:00
Benoit Marty
fb8ba32fb4 Version++ 2019-12-05 09:46:36 +01:00
Benoit Marty
3f4f7457c7
Merge pull request #689 from vector-im/feature/signin_signup 
Login and Registration
 2019-12-02 13:47:28 +01:00
Valere
a0d7aef92e Force android-gif-drawable version 
BigImageViewer update (updated the android-gif-drawable dep)
 2019-11-28 09:39:04 +01:00
Benoit Marty
2789268c23 Login screens: MSISDN: check format and compute country code 2019-11-22 12:15:19 +01:00
Benoit Marty
eb4355890e Login screens: setup autofill 2019-11-22 12:15:19 +01:00
Benoit Marty
ec2954200e Version++ 2019-11-19 09:58:48 +01:00
ganfra
6463f3439f Update Mvrx to 1.3 2019-11-12 15:11:52 +01:00
ganfra
3013d67c16 Fragment factory: start including the new version with FragmentFactory [WIP] 2019-11-04 19:33:56 +01:00
ganfra
3517873156 Timeline: Start handling code blocks. [WIP] 2019-10-29 19:08:48 +01:00
Benoit Marty
b766bce07d Version++ 2019-10-24 14:40:31 +02:00
ganfra
2974f8b200 Merge branch 'develop' into feature/attachments 2019-10-22 17:27:15 +02:00
ganfra
6cd04525aa Clean after Benoit's review 2019-10-15 11:37:22 +02:00
ganfra
13a5f784dc Merge branch 'develop' into feature/attachments 2019-10-11 17:05:03 +02:00
Benoit Marty
0a0c344bfb Upgrade RecyclerView version to fix issues with a11y. 
Also minor upgrade of some other libs
 2019-10-11 10:10:16 +02:00
ganfra
0a9ebb6bf6 Attachments: use a lib which handles for us all the intent stuff. 2019-10-09 19:51:00 +02:00
Benoit Marty
c62c77f14c Stop sending bus event from SDK to App. 2019-10-08 12:00:40 +02:00
Benoit Marty
c1c1c3f999 Use latest coroutine lib: v1.3.2 2019-10-07 16:22:09 +02:00
Benoit Marty
8b04fdab77 Upgrade other libraries 2019-10-07 16:22:09 +02:00
Benoit Marty
4ad86a13a0 Upgrade the dependencies to the latest version 2019-10-07 16:21:18 +02:00
ganfra
525da17678 Optimization: try to get a more performant reactions display management 2019-10-03 19:15:11 +02:00
ganfra
44f6391cb4 Optimize: use LazyThreeTen 2019-10-01 20:11:15 +02:00
Benoit Marty
51568c30a6 Version++ 2019-09-24 10:23:51 +02:00
Benoit Marty
36866dd24e Save draft of a message when exiting a room with non empty composer (#329) 2019-09-19 13:09:08 +02:00
Benoit Marty
6c2faff1f0 Version++ (0.6.0) 2019-09-17 14:53:50 +02:00
Benoit Marty
3e6b65e174 Handle M_CONSENT_NOT_GIVEN error (#64) 2019-09-13 18:21:56 +02:00
Benoit Marty
618e9a4f52 Fix issue with bad versionCode generated by Buildkite (#553) 2019-09-12 16:17:44 +02:00
Benoit Marty
fd6bbbd3b5 Fix issue with version name (Fixes #533) 2019-08-30 15:57:39 +02:00
Benoit Marty
0ff0b014a9 Version++ (0.5.0) 2019-08-30 15:07:04 +02:00
Benoit Marty
58f878fca9 Prepare version 0.4.0 2019-08-30 15:04:28 +02:00
Valere
7e142d201d Use EmojiCompat to build EmojiSpans from text 2019-08-27 11:06:52 +02:00
Benoit Marty
4ca2531e47 develop branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode 
Other branches (master, features, etc.) will have version code based on application version.
 2019-08-14 10:45:17 +02:00
Benoit Marty
3f792c7a84 Automatic "-dev" version suffix on non master branch 2019-08-08 16:57:03 +02:00
Benoit Marty
347dcb469a Version++ 2019-08-08 16:47:13 +02:00
Benoit Marty
e216cd15a8 Prepare release 0.3.0 2019-08-08 16:44:53 +02:00
Benoit Marty
93fd56a7ca Ensure versionCode is the wanted one for GPlay and F-Droid build 2019-08-08 16:30:44 +02:00
Benoit Marty
63f6081fa5 Split APK: generate one APK per arch, to reduce APK size of about 30% 2019-08-07 11:46:38 +02:00
ganfra
6deba31111 Direct room: finally use PagedList as we can get a lot of users in DB. 2019-07-30 14:51:14 +02:00
ganfra
5af6bf3762 Direct room: finally handle selection with chips (not as Nad design) 2019-07-25 16:34:27 +02:00
Benoit Marty
c3d945d6bb Version++ 2019-07-18 17:48:56 +02:00
Benoit Marty
d609c49b31 Prepare release 0.2.0 2019-07-18 17:47:24 +02:00
Benoit Marty
0ddef67cc9 Migrate to rxbinding 3 and fix bad layout for room directory filter (Fixes #349) 2019-07-17 14:16:20 +02:00
Valere
25f1d21bc7 Edit history 
Get history from API


cleaning


Updated change log


Missing copyrights


Code review


cleaning
 2019-07-15 14:57:12 +02:00
Benoit Marty
919dec4a56 Add ".debug" to the applicationId to be able to install the app along with the prod version 2019-07-11 17:59:07 +02:00
Benoit Marty
43b3680774 Prepare next release 2019-07-11 17:44:58 +02:00
Benoit Marty
52dced43ff Fix version code issue 2019-07-11 16:49:06 +02:00
Benoit Marty
20c8e8d922 Change the test to apply Google Service plugin to be able to run sonar 2019-07-03 18:18:07 +02:00
ganfra
9adeab6bae Perf: revert constraintLayout version as it breaks at the moment 2019-07-02 23:06:40 +02:00
ganfra
37199da52f Merge branch 'develop' into feature/Perf 2019-07-02 18:29:59 +02:00
Benoit Marty
504009499f Rename im.vector.riotredesign to im.vector.riotx 2019-07-02 17:27:08 +02:00
ganfra
41ed4b23d8 Update dependencies (tested ok) 2019-07-02 09:39:45 +02:00
Benoit Marty
7ff2477a4f
Merge pull request #241 from vector-im/feature/api16 
min API 19 - tested
 2019-06-28 15:06:40 +02:00
Valere
b14a6224ba Add lab option to show hidden events in timeline 
+ cleaning labs settings
 2019-06-28 12:45:08 +02:00
Benoit Marty
f410538e2f minSdkVersion 19 (mainly for security reason and also because of MotionLayout only supported on API 18) 2019-06-28 10:06:36 +02:00
ganfra
2063a3e535 Merge branch 'develop' into feature/dagger 2019-06-27 18:56:23 +02:00
Benoit Marty
5e619f2593 Upgrade firebase messaging version and disable Firebase Analytics 2019-06-27 10:42:36 +02:00
ganfra
b2d2582e0f Merge branch 'develop' into feature/dagger [WIP] 2019-06-26 20:58:46 +02:00
Benoit Marty
0998ffb5f2 Update open source license file 2019-06-25 09:31:45 +02:00
Benoit Marty
9d3a8e7c40 Add usage of com.google.android.gms:oss-licenses-plugin to list open source licenses 2019-06-25 09:31:45 +02:00
Benoit Marty
1cfc85a772 Display some version of Riot and SDK (Fix #185) 2019-06-21 11:13:16 +02:00
ganfra
07fee8ed3d Dagger: continue reworking on app and sdk [WIP] 2019-06-20 19:26:59 +02:00
ganfra
9c1f870694 Dagger: start handling app dependencies [WIP] 2019-06-18 20:00:20 +02:00
Benoit Marty
a7c0e87f40 Alerter: upgrade lib and change status icon color when alert is displayed 2019-06-12 16:30:30 +02:00
ganfra
07c516ccdd Merge branch 'develop' into feature/crypto 2019-06-07 19:25:55 +02:00
ganfra
81330d30cf Merge branch 'develop' into feature/crypto 2019-06-07 18:53:24 +02:00
Valere
220e6224e7 Merge develop 2019-06-07 15:42:04 +02:00
Valere
d3518c4944
Merge pull request #161 from vector-im/feature/fix_timeline_clicks 
Fix / click|longclick link interference
 2019-06-07 14:43:04 +02:00
Valere
651d0472cd Show preview for notice events in context menu + fix merge issues 2019-06-07 14:14:51 +02:00
Valere
7409003949 Fix / Bug aggregation on initial sync 
fix / All messages were not processed due to a test exiting the for loop
+ started adding context menu for non room messages
 2019-06-07 14:14:51 +02:00
Benoit Marty
fb9627b7c4 Share the debug signature to all machines which build the debug APK 2019-06-07 10:17:14 +02:00
Valere
471170a3e0 Fix / click|longclick link interference 
+ some missing long click (image content wrapper)
+ update markwon version
 2019-06-04 10:29:56 +02:00
Benoit Marty
5da29e8063 Update MxRx library from 0.7.0 to 1.0.1 2019-05-22 16:36:31 +02:00
Benoit Marty
1436667e7d Crypto 2019-05-16 10:34:17 +02:00
Valere
00fd866cc8 Reactions: Display existing reactions below the message 
- Reaction Button Bellow the message
- Upgrade to constraint layout 2.0.0 beta (for Constraint Helpers / Flow)
- Added tap on member name action
- Cleaning
 2019-05-14 11:07:53 +02:00
Valere
dcc430f91b Refactoring / revert reaction module to package in main module 2019-05-09 18:26:32 +02:00
Valere
a64f509872 WIP / emoji picker 2019-05-07 17:20:48 +02:00
ganfra
2c83ba0824 Timeline : start to handle video media. Probably to amend 2019-04-12 13:46:59 +02:00
ganfra
dcac9aed55 Merge branch 'feature/media_attachment' into develop 2019-04-11 13:21:51 +02:00
ganfra
0225fc7120 Media upload: handle local echo by pinning at the bottom... will probably be changed 2019-04-11 12:48:35 +02:00
Benoit Marty
56563412aa Autocomplete : start integrating commands. Still need to work on it 2019-04-08 15:51:35 +02:00
Benoit Marty
772670252a Make build FDroid pass 2019-04-04 11:10:12 +02:00
ganfra
18591d0287 Media: start to play with uploading media 2019-04-03 23:06:17 +02:00
Benoit Marty
87c9f6b2a0 Improve lint configuration 2019-04-03 12:04:24 +02:00
Benoit Marty
6830957d31 Import settings from Riot - not all fonctional of course 2019-04-02 18:08:43 +02:00
Benoit Marty
9048a1dbbe Rename app to vector 2019-04-02 11:24:54 +02:00
Renamed from app/build.gradle (Browse further)