Commit Graph

860 Commits

Author SHA1 Message Date
Adam Brown 6d86fe5052
Merge pull request #67 from ouchadam/dependabot/gradle/org.junit.jupiter-junit-jupiter-api-5.9.0
Bump junit-jupiter-api from 5.8.2 to 5.9.0
2022-07-28 19:54:27 +01:00
Adam Brown 95b27fc456
Merge branch 'main' into dependabot/gradle/io.mockk-mockk-1.12.5 2022-07-28 19:51:47 +01:00
dependabot[bot] 0387c0917e
Bump junit-jupiter-api from 5.8.2 to 5.9.0
Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-28 18:51:17 +00:00
Adam Brown 14fc762a46
Merge branch 'main' into dependabot/gradle/com.google.accompanist-accompanist-systemuicontroller-0.24.13-rc 2022-07-28 19:51:16 +01:00
dependabot[bot] 36b740e0d3
Bump mockk from 1.12.4 to 1.12.5
Bumps [mockk](https://github.com/mockk/mockk) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.4...1.12.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-28 18:51:08 +00:00
Adam Brown a5ef71fc1e
Merge pull request #68 from ouchadam/dependabot/gradle/org.junit.jupiter-junit-jupiter-engine-5.9.0
Bump junit-jupiter-engine from 5.8.2 to 5.9.0
2022-07-28 19:50:48 +01:00
Adam Brown 8c1265c957 avoiding notification overlap by only using alerting summary group instead of all notifications 2022-07-28 19:43:27 +01:00
dependabot[bot] 3ac9df765d
Bump junit-jupiter-engine from 5.8.2 to 5.9.0
Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-27 05:34:28 +00:00
Adam Brown 4406d3a194 Merge branch 'main' of github.com:ouchadam/helium 2022-07-26 22:48:38 +01:00
Adam Brown 2a0f28d3b3 splitting dm and group notifications into separate channels
- adding notification system group
- only notifying the summary to avoid overlapping notifications
2022-07-26 22:48:24 +01:00
Adam Brown 5fe12926bb
Merge branch 'main' into dependabot/gradle/com.google.accompanist-accompanist-systemuicontroller-0.24.13-rc 2022-07-25 10:44:10 +01:00
Adam Brown f8be5166ef
Merge pull request #66 from ouchadam/gradlew-update-7.5
Update Gradle Wrapper from 7.4.2 to 7.5
2022-07-25 10:44:01 +01:00
Adam Brown ccc4a20b0c
Merge branch 'main' into gradlew-update-7.5 2022-07-25 10:34:19 +01:00
Adam Brown 6953ddcd11
Merge pull request #65 from ouchadam/dependabot/gradle/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.6.4
Bump kotlinx-coroutines-core from 1.6.3 to 1.6.4
2022-07-16 11:41:45 +01:00
dependabot[bot] 8e61a30af0
Bump kotlinx-coroutines-core from 1.6.3 to 1.6.4
Bumps [kotlinx-coroutines-core](https://github.com/Kotlin/kotlinx.coroutines) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-16 10:07:36 +00:00
Adam Brown cb9943c423
Merge pull request #64 from ouchadam/dependabot/gradle/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.6.4
Bump kotlinx-coroutines-test from 1.6.3 to 1.6.4
2022-07-16 11:07:07 +01:00
gradle-update-robot be00219d06 Update Gradle Wrapper from 7.4.2 to 7.5.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2022-07-15 00:24:46 +00:00
dependabot[bot] 13700444b9
Bump kotlinx-coroutines-test from 1.6.3 to 1.6.4
Bumps [kotlinx-coroutines-test](https://github.com/Kotlin/kotlinx.coroutines) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-14 05:31:19 +00:00
Adam Brown b0a438ee98 diffing historical event timestamps to avoid acting on them as new events
- fixes an issue where the database window would pull in legacy events after marking new events as read
2022-07-13 23:03:58 +01:00
Adam Brown 63618276b7 initialisating channels as part of the first notification emission rather than blocking application init 2022-07-13 18:32:10 +01:00
Adam Brown 6f18d48905 adding missing messaging style config 2022-07-13 18:24:17 +01:00
Adam Brown d9953d840c
Merge pull request #62 from ouchadam/feature/dep-updates
Dependency updates
2022-07-11 23:02:04 +01:00
Adam Brown 9d5ef07f1b
Merge branch 'main' into feature/dep-updates 2022-07-11 22:55:03 +01:00
Adam Brown 02c2e6064e
Merge pull request #63 from ouchadam/force-working-synapse-version
Force working synapse version
2022-07-11 22:54:55 +01:00
Adam Brown ca0889603a forcing synapse to last known working version 2022-07-11 22:43:11 +01:00
Adam Brown 671913fd69 using the same group alert behaviour for the summary 2022-07-11 21:08:24 +01:00
Adam Brown c7da6c1663 allowing h/w information to be null 2022-07-11 21:07:10 +01:00
Adam Brown 6c3311284c lifting desugar'd dep to the deps file 2022-07-11 19:37:53 +01:00
Adam Brown 880a4fd78a updating crashlytics plugin 2022-07-11 19:13:55 +01:00
Adam Brown d8277c3f24 updating to kotlin 1.7.0 with separating compose compiler 2022-07-11 19:05:29 +01:00
dependabot[bot] eb8fddd4cd
Bump accompanist-systemuicontroller from 0.24.10-beta to 0.24.13-rc
Bumps [accompanist-systemuicontroller](https://github.com/google/accompanist) from 0.24.10-beta to 0.24.13-rc.
- [Release notes](https://github.com/google/accompanist/releases)
- [Commits](https://github.com/google/accompanist/compare/v0.24.10-beta...v0.24.13-rc)

---
updated-dependencies:
- dependency-name: com.google.accompanist:accompanist-systemuicontroller
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-30 05:42:15 +00:00
Adam Brown d6d03c7b24
Merge pull request #59 from ouchadam/dependabot/gradle/ktorVer-2.0.3
Bump ktorVer from 2.0.2 to 2.0.3
2022-06-29 20:08:25 +01:00
dependabot[bot] 27e8e7593c
Bump ktorVer from 2.0.2 to 2.0.3
Bumps `ktorVer` from 2.0.2 to 2.0.3.

Updates `ktor-client-android` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/2.0.2...2.0.3)

Updates `ktor-client-core` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/2.0.2...2.0.3)

Updates `ktor-client-serialization` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/2.0.2...2.0.3)

Updates `ktor-serialization-kotlinx-json` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/2.0.2...2.0.3)

Updates `ktor-client-logging-jvm` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/2.0.2...2.0.3)

Updates `ktor-client-java` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/2.0.2...2.0.3)

Updates `ktor-client-content-negotiation` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/2.0.2...2.0.3)

---
updated-dependencies:
- dependency-name: io.ktor:ktor-client-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.ktor:ktor-client-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.ktor:ktor-client-serialization
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.ktor:ktor-serialization-kotlinx-json
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.ktor:ktor-client-logging-jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.ktor:ktor-client-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.ktor:ktor-client-content-negotiation
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 18:44:18 +00:00
Adam Brown 44fd04782e
Merge pull request #58 from ouchadam/dependabot/gradle/org.jetbrains.kotlinx-kotlinx-coroutines-test-1.6.3
Bump kotlinx-coroutines-test from 1.6.2 to 1.6.3
2022-06-29 19:43:40 +01:00
dependabot[bot] 8f64529154
Bump kotlinx-coroutines-test from 1.6.2 to 1.6.3
Bumps [kotlinx-coroutines-test](https://github.com/Kotlin/kotlinx.coroutines) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.2...1.6.3)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 05:24:24 +00:00
Adam Brown 6292c2d55a
Merge pull request #56 from ouchadam/dependabot/gradle/org.jetbrains.kotlinx-kotlinx-coroutines-core-1.6.3
Bump kotlinx-coroutines-core from 1.6.2 to 1.6.3
2022-06-28 18:19:09 +01:00
dependabot[bot] 184955d70e
Bump kotlinx-coroutines-core from 1.6.2 to 1.6.3
Bumps [kotlinx-coroutines-core](https://github.com/Kotlin/kotlinx.coroutines) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.2...1.6.3)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-21 05:38:54 +00:00
Adam Brown a7a5d73bac merging with main 2022-06-13 19:10:02 +01:00
Adam Brown 1450a70283 Merge branch 'main' of github.com:ouchadam/helium into feature/share-images-via-small-talk 2022-06-13 19:05:41 +01:00
Adam Brown 293130dd58
Merge pull request #52 from ouchadam/dependabot/gradle/com.google.accompanist-accompanist-systemuicontroller-0.24.10-beta
Bump accompanist-systemuicontroller from 0.24.9-beta to 0.24.10-beta
2022-06-13 19:04:38 +01:00
Adam Brown 63be7ad0b1
Merge pull request #53 from ouchadam/dependabot/gradle/org.matrix.android-olm-sdk-3.2.12
Bump olm-sdk from 3.2.11 to 3.2.12
2022-06-13 19:04:20 +01:00
Adam Brown 45f773e986
Merge pull request #54 from ouchadam/message-tests
Separating initial sync vs cached sync loading states
2022-06-13 19:04:00 +01:00
Adam Brown 173d34a535 updating timeline to take into account start syncing emissions 2022-06-13 18:54:56 +01:00
Adam Brown 83537b1367 handling the first sync without any local cache as a loading state rather than showing the empty view 2022-06-11 23:11:48 +01:00
Adam Brown b82397d965 emitting events each time the sync completes so that we can know if the first sync is happening 2022-06-11 22:46:41 +01:00
Adam Brown 482e5c15b7 using a temporary database for the second device logins, exposing a false positive in the smoke tests 2022-06-11 21:55:03 +01:00
Adam Brown 34423b2d50 Merge branch 'main' into message-tests 2022-06-11 21:44:10 +01:00
Adam Brown e9ad0b4a64 Merge branch 'main' into feature/share-images-via-small-talk 2022-06-11 19:11:45 +01:00
Adam Brown 5a9a5136e2
Merge branch 'main' into dependabot/gradle/org.matrix.android-olm-sdk-3.2.12 2022-06-11 19:09:31 +01:00
Adam Brown 2fdcbc7223 updating coverage report location to match the android gradle plugin update 2022-06-11 19:07:17 +01:00