Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
8127853f
Commit
8127853f
authored
Oct 31, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Setup connection info.
parent
29bf3174
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
4 deletions
+27
-4
OnBoardingPresenter.kt
...entication/onboarding/presentation/OnBoardingPresenter.kt
+1
-2
ServerPresenter.kt
...oid/authentication/server/presentation/ServerPresenter.kt
+0
-2
CheckServerPresenter.kt
...ocket/android/server/presentation/CheckServerPresenter.kt
+26
-0
No files found.
app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt
View file @
8127853f
...
@@ -76,9 +76,8 @@ class OnBoardingPresenter @Inject constructor(
...
@@ -76,9 +76,8 @@ class OnBoardingPresenter @Inject constructor(
view
.
showLoading
()
view
.
showLoading
()
try
{
try
{
withContext
(
DefaultDispatcher
)
{
withContext
(
DefaultDispatcher
)
{
refreshSettingsInteractor
.
refresh
(
serverUrl
)
setupConnectionInfo
(
serverUrl
)
setupConnectionInfo
(
serverUrl
)
refreshSettingsInteractor
.
refresh
(
serverUrl
)
// preparing next fragment before showing it
// preparing next fragment before showing it
checkEnabledAccounts
(
serverUrl
)
checkEnabledAccounts
(
serverUrl
)
...
...
app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt
View file @
8127853f
...
@@ -95,8 +95,6 @@ class ServerPresenter @Inject constructor(
...
@@ -95,8 +95,6 @@ class ServerPresenter @Inject constructor(
withContext
(
DefaultDispatcher
)
{
withContext
(
DefaultDispatcher
)
{
refreshSettingsInteractor
.
refresh
(
serverUrl
)
refreshSettingsInteractor
.
refresh
(
serverUrl
)
setupConnectionInfo
(
serverUrl
)
// preparing next fragment before showing it
// preparing next fragment before showing it
checkEnabledAccounts
(
serverUrl
)
checkEnabledAccounts
(
serverUrl
)
checkIfLoginFormIsEnabled
()
checkIfLoginFormIsEnabled
()
...
...
app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt
View file @
8127853f
...
@@ -82,6 +82,31 @@ abstract class CheckServerPresenter constructor(
...
@@ -82,6 +82,31 @@ abstract class CheckServerPresenter constructor(
settings
=
it
settings
=
it
}
}
client
=
factory
.
create
(
serverUrl
)
client
=
factory
.
create
(
serverUrl
)
state
=
""
facebookOauthUrl
=
null
githubOauthUrl
=
null
googleOauthUrl
=
null
linkedinOauthUrl
=
null
gitlabOauthUrl
=
null
wordpressOauthUrl
=
null
casLoginUrl
=
null
casToken
=
null
casServiceName
=
null
casServiceNameTextColor
=
0
casServiceButtonColor
=
0
customOauthUrl
=
null
customOauthServiceName
=
null
customOauthServiceNameTextColor
=
0
customOauthServiceButtonColor
=
0
samlUrl
=
null
samlToken
=
null
samlServiceName
=
null
samlServiceNameTextColor
=
0
samlServiceButtonColor
=
0
totalSocialAccountsEnabled
=
0
isLoginFormEnabled
=
false
isNewAccountCreationEnabled
=
false
}
}
internal
fun
checkServerInfo
(
serverUrl
:
String
):
Job
{
internal
fun
checkServerInfo
(
serverUrl
:
String
):
Job
{
...
@@ -263,6 +288,7 @@ abstract class CheckServerPresenter constructor(
...
@@ -263,6 +288,7 @@ abstract class CheckServerPresenter constructor(
val
serviceNameTextColor
=
val
serviceNameTextColor
=
getServiceNameColor
(
serviceMap
)
getServiceNameColor
(
serviceMap
)
val
serviceButtonColor
=
getServiceButtonColor
(
serviceMap
)
val
serviceButtonColor
=
getServiceButtonColor
(
serviceMap
)
if
(
customOauthServiceName
!=
null
&&
if
(
customOauthServiceName
!=
null
&&
host
!=
null
&&
host
!=
null
&&
authorizePath
!=
null
&&
authorizePath
!=
null
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment