Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
circles-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Circles
circles-android
Commits
c7303840
Commit
c7303840
authored
2 years ago
by
Taras
Browse files
Options
Downloads
Patches
Plain Diff
Change REGISTRATION_TOKEN_KEY_PREFIX
parent
72c0b9fe
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/com/futo/circles/core/Constants.kt
+1
-1
1 addition, 1 deletion
app/src/main/java/com/futo/circles/core/Constants.kt
app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
+6
-7
6 additions, 7 deletions
...java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
with
7 additions
and
8 deletions
app/src/main/java/com/futo/circles/core/Constants.kt
+
1
−
1
View file @
c7303840
...
@@ -2,7 +2,7 @@ package com.futo.circles.core
...
@@ -2,7 +2,7 @@ package com.futo.circles.core
const
val
FILE_PROVIDER_AUTHORITY_PREFIX
=
".provider"
const
val
FILE_PROVIDER_AUTHORITY_PREFIX
=
".provider"
const
val
REGISTRATION_TOKEN_KEY
=
"org.matrix.msc3231.
login.registration_token"
const
val
REGISTRATION_TOKEN_KEY
_PREFIX
=
"
login.registration_token"
const
val
TERMS_URL_EXTENSION
=
"_matrix/consent"
const
val
TERMS_URL_EXTENSION
=
"_matrix/consent"
const
val
VALIDATION_TOKEN_SUBMIT_URL_PREFIX
=
"_matrix/identity/api/v1/validate/email/submitToken"
const
val
VALIDATION_TOKEN_SUBMIT_URL_PREFIX
=
"_matrix/identity/api/v1/validate/email/submitToken"
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
+
6
−
7
View file @
c7303840
...
@@ -3,7 +3,7 @@ package com.futo.circles.feature.sign_up
...
@@ -3,7 +3,7 @@ package com.futo.circles.feature.sign_up
import
android.content.Context
import
android.content.Context
import
androidx.lifecycle.MutableLiveData
import
androidx.lifecycle.MutableLiveData
import
com.futo.circles.R
import
com.futo.circles.R
import
com.futo.circles.core.REGISTRATION_TOKEN_KEY
import
com.futo.circles.core.REGISTRATION_TOKEN_KEY
_PREFIX
import
com.futo.circles.core.SingleEventLiveData
import
com.futo.circles.core.SingleEventLiveData
import
com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
import
com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
import
com.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
import
com.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
...
@@ -93,12 +93,11 @@ class SignUpDataSource(
...
@@ -93,12 +93,11 @@ class SignUpDataSource(
}
}
private
fun
handleStageOther
(
type
:
String
):
NavigationEvents
=
private
fun
handleStageOther
(
type
:
String
):
NavigationEvents
=
when
(
type
)
{
if
(
type
.
endsWith
(
REGISTRATION_TOKEN_KEY_PREFIX
))
NavigationEvents
.
TokenValidation
REGISTRATION_TOKEN_KEY
->
NavigationEvents
.
TokenValidation
else
throw
IllegalArgumentException
(
else
->
throw
IllegalArgumentException
(
context
.
getString
(
R
.
string
.
not_supported_stage_format
,
type
)
context
.
getString
(
R
.
string
.
not_supported_stage_format
,
type
)
)
)
}
private
fun
updatePageSubtitle
()
{
private
fun
updatePageSubtitle
()
{
val
size
=
stagesToComplete
.
size
val
size
=
stagesToComplete
.
size
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment