Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

circles-android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

38d32d6a

Commit 38d32d6a authored 10 months ago by Taras

Downloads
- Plain Diff

Merge branch 'feature/presence' into develop

parents 14ae3f34 b6ad8499

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

auth/src/gplay/java/org/futo/circles/auth/subscriptions/GoogleSubscriptionsManager.kt 2 additions, 1 deletion

.../circles/auth/subscriptions/GoogleSubscriptionsManager.kt
auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/RestoreBackupDataSource.kt 6 additions, 7 deletions

...th/feature/pass_phrase/restore/RestoreBackupDataSource.kt
auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/SSSSDataSource.kt 2 additions, 5 deletions

...ircles/auth/feature/pass_phrase/restore/SSSSDataSource.kt
auth/src/main/java/org/futo/circles/auth/feature/profile/setup/SetupProfileDataSource.kt 2 additions, 2 deletions

...cles/auth/feature/profile/setup/SetupProfileDataSource.kt
core/build.gradle 2 additions, 2 deletions

core/build.gradle
core/src/main/java/org/futo/circles/core/provider/KeyStoreProvider.kt 0 additions, 81 deletions

...n/java/org/futo/circles/core/provider/KeyStoreProvider.kt
core/src/main/java/org/futo/circles/core/provider/PreferencesProvider.kt 0 additions, 9 deletions

...ava/org/futo/circles/core/provider/PreferencesProvider.kt

with 14 additions and 107 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment