diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-12-20 18:37:13 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-12-20 18:37:13 +0100 |
| commit | 8bc035e5785b8a14c26cdb6ab409242b66554992 (patch) | |
| tree | 3abe8236fe9789b0aebcf50b4cf3c7ebfe0605e1 /src/se/leap/bitmaskclient/EipServiceFragment.java | |
| parent | a651099981ddc9ed5c17a25b2bb618b161cec048 (diff) | |
| parent | 3f5d756fa1a37dba00c400ca2a6197af5af1071e (diff) | |
Merge branch 'develop' of ssh://leap.se:22/bitmask_android into develop
Diffstat (limited to 'src/se/leap/bitmaskclient/EipServiceFragment.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/EipServiceFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java index e182b3fd..b409394b 100644 --- a/src/se/leap/bitmaskclient/EipServiceFragment.java +++ b/src/se/leap/bitmaskclient/EipServiceFragment.java @@ -202,7 +202,10 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli switchState = false; } else if (state.equals("NOPROCESS")){ statusMessage = logmessage; - } else { + } else if (state.equals("ASSIGN_IP")){ //don't show assigning message in eipStatus + statusMessage = (String) eipStatus.getText(); + } + else { statusMessage = prefix + " " + logmessage; } |