Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
leap
bitmask_android
Commits
ea8b752e
Commit
ea8b752e
authored
Mar 09, 2019
by
cyberta
Browse files
don't show toasts if app is reconnecting with different gateway in this release
parent
b6b538ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+4
-5
No files found.
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
View file @
ea8b752e
...
@@ -366,15 +366,14 @@ public class EipFragment extends Fragment implements Observer {
...
@@ -366,15 +366,14 @@ public class EipFragment extends Fragment implements Observer {
return
;
return
;
}
}
Log
.
d
(
TAG
,
"eip fragment eipStatus state: "
+
eipStatus
.
getState
()
+
" - level: "
+
eipStatus
.
getLevel
()
+
" - is reconnecting: "
+
eipStatus
.
isReconnecting
());
//
Log.d(TAG, "eip fragment eipStatus state: " + eipStatus.getState() + " - level: " + eipStatus.getLevel() + " - is reconnecting: " + eipStatus.isReconnecting());
if
(
eipStatus
.
isConnecting
()
)
{
if
(
eipStatus
.
isConnecting
()
)
{
showConnectingLayout
(
activity
);
showConnectingLayout
(
activity
);
Log
.
d
(
TAG
,
"eip show connecting layout"
);
if
(
eipStatus
.
isReconnecting
())
{
if
(
eipStatus
.
isReconnecting
())
{
Log
.
d
(
TAG
,
"eip show reconnecting toast!"
);
//
Log.d(TAG, "eip show reconnecting toast!");
showReconnectToast
(
activity
);
//
showReconnectToast(activity);
}
}
}
else
if
(
eipStatus
.
isConnected
()
)
{
}
else
if
(
eipStatus
.
isConnected
()
)
{
mainButton
.
setText
(
activity
.
getString
(
R
.
string
.
vpn_button_turn_off
));
mainButton
.
setText
(
activity
.
getString
(
R
.
string
.
vpn_button_turn_off
));
...
@@ -396,7 +395,7 @@ public class EipFragment extends Fragment implements Observer {
...
@@ -396,7 +395,7 @@ public class EipFragment extends Fragment implements Observer {
colorBackgroundALittle
();
colorBackgroundALittle
();
}
else
if
(
eipStatus
.
isDisconnected
()
&&
reconnectingWithDifferentGateway
())
{
}
else
if
(
eipStatus
.
isDisconnected
()
&&
reconnectingWithDifferentGateway
())
{
showConnectingLayout
(
activity
);
showConnectingLayout
(
activity
);
showRetryToast
(
activity
);
//
showRetryToast(activity);
}
}
else
{
else
{
mainButton
.
setText
(
activity
.
getString
(
R
.
string
.
vpn_button_turn_on
));
mainButton
.
setText
(
activity
.
getString
(
R
.
string
.
vpn_button_turn_on
));
...
...
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