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
51a9b57d
Commit
51a9b57d
authored
Dec 30, 2017
by
Aniket
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makes suggested changes
parent
287fe196
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
11 deletions
+6
-11
LoginActivity.java
...main/java/chat/rocket/android/activity/LoginActivity.java
+1
-3
LoginContract.java
.../rocket/android/fragment/server_config/LoginContract.java
+1
-1
LoginFragment.kt
...at/rocket/android/fragment/server_config/LoginFragment.kt
+3
-3
LoginPresenter.kt
...t/rocket/android/fragment/server_config/LoginPresenter.kt
+1
-1
BackStackHelper.java
...main/java/chat/rocket/android/helper/BackStackHelper.java
+0
-3
No files found.
app/src/main/java/chat/rocket/android/activity/LoginActivity.java
View file @
51a9b57d
package
chat
.
rocket
.
android
.
activity
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
...
...
@@ -100,8 +99,7 @@ public class LoginActivity extends AbstractFragmentActivity implements LoginCont
}
else
if
(
BackStackHelper
.
FRAGMENT_TAG
.
equals
(
"login"
))
{
LoginFragment
loginFragment
=
(
LoginFragment
)
getSupportFragmentManager
()
.
findFragmentById
(
getLayoutContainerForFragment
());
Context
loginActivityContext
=
this
;
loginFragment
.
goBack
(
loginActivityContext
);
loginFragment
.
goBack
();
}
return
true
;
}
...
...
app/src/main/java/chat/rocket/android/fragment/server_config/LoginContract.java
View file @
51a9b57d
...
...
@@ -26,7 +26,7 @@ public interface LoginContract {
void
showTwoStepAuth
();
void
goBack
(
Context
ctx
);
void
goBack
();
}
interface
Presenter
extends
BaseContract
.
Presenter
<
View
>
{
...
...
app/src/main/java/chat/rocket/android/fragment/server_config/LoginFragment.kt
View file @
51a9b57d
package
chat.rocket.android.fragment.server_config
import
android.content.Context
import
android.os.Bundle
import
android.support.constraint.ConstraintLayout
import
android.support.design.widget.Snackbar
...
...
@@ -161,8 +160,9 @@ class LoginFragment : AbstractServerConfigFragment(), LoginContract.View {
presenter
.
release
()
super
.
onPause
()
}
override
fun
goBack
(
ctx
:
Context
?)
{
presenter
.
goBack
(
ctx
)
override
fun
goBack
()
{
presenter
.
goBack
(
context
)
}
}
app/src/main/java/chat/rocket/android/fragment/server_config/LoginPresenter.kt
View file @
51a9b57d
...
...
@@ -33,7 +33,7 @@ class LoginPresenter(private val loginServiceConfigurationRepository: LoginServi
}
override
fun
goBack
(
ctx
:
Context
?)
{
override
fun
goBack
(
ctx
:
Context
?)
{
val
context
=
RocketChatApplication
.
getInstance
()
val
hostname
=
RocketChatCache
.
getSelectedServerHostname
()
hostname
?.
let
{
...
...
app/src/main/java/chat/rocket/android/helper/BackStackHelper.java
View file @
51a9b57d
package
chat
.
rocket
.
android
.
helper
;
/**
* Created by whocares on 28/12/17.
*/
public
class
BackStackHelper
{
public
static
String
FRAGMENT_TAG
=
"login"
;
...
...
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