summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/se/leap/leapclient/Dashboard.java23
-rw-r--r--src/se/leap/openvpn/OpenVpnService.java6
2 files changed, 20 insertions, 9 deletions
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index f10966b2..965e8692 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -7,6 +7,7 @@ import org.json.JSONObject;
import se.leap.leapclient.ProviderAPIResultReceiver.Receiver;
import se.leap.openvpn.AboutFragment;
+import se.leap.openvpn.LogWindow;
import se.leap.openvpn.MainActivity;
import se.leap.openvpn.OpenVPN;
import se.leap.openvpn.OpenVPN.StateListener;
@@ -188,13 +189,28 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
}
}
});
-
+
//TODO write our info into the view fragment that will expand with details and a settings button
// TODO set eip overview subview
// TODO make eip type clickable, show subview
// TODO attach vpn status feedback to eip overview view
// TODO attach settings button to something
}
+
+ public void toggleEipOverview(View view) {
+ if (eipDetail.isShown())
+ eipDetail.setVisibility(View.GONE);
+ else
+ eipDetail.setVisibility(View.VISIBLE);
+ }
+
+ // FIXME!! I will move to EIPSettingsFragment and begone!
+ // Also means change onClick property for status line
+ public void showEIPLog(View view){
+ Intent intent = new Intent(getBaseContext(),LogWindow.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+ startActivity(intent);
+ }
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
@@ -253,11 +269,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
}
}
-
- @SuppressWarnings("unused")
- private void toggleOverview() {
- // TODO Expand the one line overview item to show some details
- }
@Override
public void authenticate(String username, String password) {
diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java
index 2408483d..a4aa8a32 100644
--- a/src/se/leap/openvpn/OpenVpnService.java
+++ b/src/se/leap/openvpn/OpenVpnService.java
@@ -175,10 +175,10 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
}
PendingIntent getLogPendingIntent() {
- // Let the configure Button show the Log
- Intent intent = new Intent(getBaseContext(),LogWindow.class);
+ // Let the configure Button show the Dashboard
+ Intent intent = new Intent(Dashboard.getAppContext(),Dashboard.class);
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
- PendingIntent startLW = PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
+ PendingIntent startLW = PendingIntent.getActivity(getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
return startLW;