Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-29 15:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,606 Commits 531 Branches 158 Tags 486 MiB
a29ccda68e
Commit Graph

9606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoit Marty
ca39182665
Merge pull request #3592 from vector-im/dependabot/gradle/io.mockk-mockk-1.12.0 
Bump mockk from 1.11.0 to 1.12.0
 2021-07-05 14:37:20 +02:00
Benoit Marty
f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0 
Bump androidxTest_version from 1.3.0 to 1.4.0
 2021-07-05 14:37:14 +02:00
Benoit Marty
80b1aa3c01
Merge pull request #3590 from vector-im/dependabot/gradle/androidx.test-orchestrator-1.4.0 
Bump orchestrator from 1.3.0 to 1.4.0
 2021-07-05 14:37:07 +02:00
Benoit Marty
c443cffca5
Merge pull request #3627 from vector-im/gradlew-update-7.1.1 
Update Gradle Wrapper from 7.1 to 7.1.1
 2021-07-05 14:36:04 +02:00
Benoit Marty
72dcc92032 Version++ 2021-07-05 14:27:33 +02:00
Benoit Marty
cf5ab304df Merge branch 'release/1.1.12' into develop 2021-07-05 09:57:56 +02:00
Benoit Marty
9673b3b15b Release: fastlane 2021-07-05 09:56:27 +02:00
Benoit Marty
09e362ec6b Release: towncrier 2021-07-05 09:55:22 +02:00
Benoit Marty
76f4c81d2d Hide password... Oups 2021-07-05 09:50:20 +02:00
Benoit Marty
2d860eaa2a
Merge pull request #3622 from vector-im/feature/bma/crash_realm 
CryptoStore migration has to be object to avoid crash
 2021-07-03 20:08:57 +02:00
gradle-update-robot
4ad5deac38 Update Gradle Wrapper from 7.1 to 7.1.1. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2021-07-03 00:09:56 +00:00
dependabot[bot]
9ff1e20f07
Bump material from 1.3.0 to 1.4.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-02 23:07:53 +00:00
David Baker
78c87870ae changelog 2021-07-02 20:22:14 +01:00
David Baker
fe4c4832bd Use different copy for self verification 
The copy all refers to 'their' device for when you're verifying
someone else. Update it to refer to your own devices in the case
where you're verifying one of your own devices.
 2021-07-02 18:38:57 +01:00
Benoit Marty
2513be744c CryptoStore migration has to be object to avoid crash 
Thread: main, Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. The most likely cause is that equals() and hashCode() are not overridden in the migration class: org.matrix.android.sdk.internal.database.RealmSessionStoreMigration
 2021-07-02 17:29:44 +02:00
Benoit Marty
2a0230633d
Merge pull request #3620 from vector-im/feature/bma/fix_wl 
Fix compilation issue
 2021-07-02 17:29:04 +02:00
Benoit Marty
2c7b947d27 Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 15:32:01 +02:00
Benoit Marty
f06d2b1734 Fix typo 2021-07-02 14:55:30 +02:00
Benoit Marty
1eea734a4c Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 12:53:00 +02:00
Benoit Marty
dc50246ec4
Merge pull request #3618 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-07-02 10:25:45 +02:00
Weblate
64b6779cfa Merge branch 'origin/develop' into Weblate. 2021-07-02 07:52:44 +00:00
Benoit Marty
b0f7268d13
Merge pull request #3553 from vector-im/feature/fga/fix_timeline_visibility 
Fix some issues with timeline cache invalidation and visibility.
 2021-07-02 09:40:37 +02:00
Benoit Marty
d4009476f9 Cleanup 2021-07-02 09:39:32 +02:00
Benoit Marty
7dc5d8490f
Merge pull request #3584 from vector-im/feature/bca/fix_oom_spacechild 
Fix / dm flattenParents always growing
 2021-07-02 09:35:51 +02:00
lvre
1906fbdeaa Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-02 01:04:01 +00:00
dependabot[bot]
9430d7a5dd
Bump realm-gradle-plugin from 10.6.0 to 10.6.1 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.6.0 to 10.6.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.6.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.6.0...v10.6.1)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-01 23:07:36 +00:00
Valere
adcd1a64df empty migration to fix big flattenParentIds for DM 2021-07-01 15:28:26 +02:00
Benoit Marty
ef31aad42c Fix copyright 2021-07-01 14:47:04 +02:00
Benoit Marty
47ef0d90fc Open upgraded room when upgrading from the room profile 2021-07-01 14:31:27 +02:00
Benoit Marty
ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00
Benoit Marty
69c399a229
Merge pull request #3529 from erikhuizinga/erikhuizinga-3527-fix-google-play-service-application 
Apply Google Services Gradle plugin more robustly
 2021-07-01 10:16:00 +02:00
dependabot[bot]
1ae88afcda
Bump gradle from 4.2.1 to 4.2.2 
Bumps gradle from 4.2.1 to 4.2.2.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:09:18 +00:00
dependabot[bot]
752290424c
Bump core-ktx from 1.5.0 to 1.6.0 
Bumps core-ktx from 1.5.0 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:07:55 +00:00
dependabot[bot]
7316bf4ee0
Bump mockk-android from 1.11.0 to 1.12.0 
Bumps [mockk-android](https://github.com/mockk/mockk) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:07:27 +00:00
dependabot[bot]
f1001231d6
Bump mockk from 1.11.0 to 1.12.0 
Bumps [mockk](https://github.com/mockk/mockk) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:35 +00:00
dependabot[bot]
2ebfeb1709
Bump androidxTest_version from 1.3.0 to 1.4.0 
Bumps `androidxTest_version` from 1.3.0 to 1.4.0.

Updates `core` from 1.3.0 to 1.4.0

Updates `runner` from 1.3.0 to 1.4.0

Updates `rules` from 1.3.0 to 1.4.0

---
updated-dependencies:
- dependency-name: androidx.test:core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:rules
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:24 +00:00
dependabot[bot]
3378be935b
Bump orchestrator from 1.3.0 to 1.4.0 
Bumps orchestrator from 1.3.0 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.test:orchestrator
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:02 +00:00
Benoit Marty
ec515ced66 PR review part 1 2021-06-30 18:54:13 +02:00
Benoit Marty
3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade 2021-06-30 17:56:32 +02:00
Benoit Marty
a8bef415b7
Merge pull request #3587 from vector-im/feature/fga/fix_video_call_crash 
Fix crash after video call
 2021-06-30 17:22:09 +02:00
ganfra
de64df3cdb Fix crash after video call 2021-06-30 14:50:30 +02:00
Benoit Marty
7292c4e13d Code quality 2021-06-30 13:57:42 +02:00
Benoit Marty
ea6b0b6a43 Fix issue when sign-in using matrixId 2021-06-30 12:53:37 +02:00
lvre
1a0f29ff94 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-06-30 10:34:47 +00:00
libexus
c350c94827 Translated using Weblate (German) 
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-30 10:34:47 +00:00
Benoit Marty
14ac5a292c Auto review 2021-06-30 12:32:43 +02:00
Benoit Marty
24d2669255 Keep the data entered by the user for the UI 
Actually import what has been done in Login V2...
 2021-06-30 12:07:24 +02:00
Benoit Marty
8f3db11693 Perform .well-known request first, even if the entered URL is a valid homeserver base url 2021-06-30 11:52:04 +02:00
Benoit Marty
a61917f2b4 Also change base URL for federationAPI 2021-06-30 11:19:22 +02:00
Benoit Marty
08000dce55 Update the UI showing the homeserver API url in developer mode 2021-06-30 11:14:44 +02:00