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
d882944a
Commit
d882944a
authored
Aug 04, 2018
by
divyanshu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes
parent
d0822a47
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
21 deletions
+3
-21
LoginFragment.kt
...t/rocket/android/authentication/login/ui/LoginFragment.kt
+0
-18
ServerFragment.kt
...rocket/android/authentication/server/ui/ServerFragment.kt
+1
-1
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
No files found.
app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt
View file @
d882944a
...
@@ -263,24 +263,6 @@ class LoginFragment : Fragment(), LoginView {
...
@@ -263,24 +263,6 @@ class LoginFragment : Fragment(), LoginView {
}
}
}
}
override
fun
enableLoginByWordpress
()
{
ui
{
button_wordpress
.
isClickable
=
true
}
}
override
fun
setupWordpressButtonListener
(
wordpressUrl
:
String
,
state
:
String
)
{
ui
{
activity
->
button_wordpress
.
setOnClickListener
{
startActivityForResult
(
activity
.
oauthWebViewIntent
(
wordpressUrl
,
state
),
REQUEST_CODE_FOR_OAUTH
)
activity
.
overridePendingTransition
(
R
.
anim
.
slide_up
,
R
.
anim
.
hold
)
}
}
}
override
fun
addCustomOauthServiceButton
(
override
fun
addCustomOauthServiceButton
(
customOauthUrl
:
String
,
customOauthUrl
:
String
,
state
:
String
,
state
:
String
,
...
...
app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
View file @
d882944a
...
@@ -116,7 +116,7 @@ class ServerFragment : Fragment(), ServerView {
...
@@ -116,7 +116,7 @@ class ServerFragment : Fragment(), ServerView {
constraint_layout
.
viewTreeObserver
.
removeOnGlobalLayoutListener
(
layoutListener
)
constraint_layout
.
viewTreeObserver
.
removeOnGlobalLayoutListener
(
layoutListener
)
// reset deep link info, so user can come back and log to another server...
// reset deep link info, so user can come back and log to another server...
deepLinkInfo
=
null
deepLinkInfo
=
null
relative
_layout
.
viewTreeObserver
.
removeOnGlobalLayoutListener
(
layoutListener
)
constraint
_layout
.
viewTreeObserver
.
removeOnGlobalLayoutListener
(
layoutListener
)
}
}
override
fun
showInvalidServerUrlMessage
()
=
showMessage
(
getString
(
R
.
string
.
msg_invalid_server_url
))
override
fun
showInvalidServerUrlMessage
()
=
showMessage
(
getString
(
R
.
string
.
msg_invalid_server_url
))
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
d882944a
#
Fri May 18 17:08:16
IST 2018
#
Sat Aug 04 19:02:01
IST 2018
distributionBase
=
GRADLE_USER_HOME
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.9-
rc-2-
all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.9-all.zip
distributionSha256Sum
=
9bc16f929e5920a9a27fef22c65a8ab8140d705e418de0159ca6eb7f08a74200
distributionSha256Sum
=
9bc16f929e5920a9a27fef22c65a8ab8140d705e418de0159ca6eb7f08a74200
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