Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask_android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
cyberta
bitmask_android
Commits
ea8b752e
Commit
ea8b752e
authored
6 years ago
by
cyberta
Browse files
Options
Downloads
Patches
Plain Diff
don't show toasts if app is reconnecting with different gateway in this release
parent
b6b538ae
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+4
-5
4 additions, 5 deletions
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
with
4 additions
and
5 deletions
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+
4
−
5
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
));
...
...
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