summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/leap/bitmask/pix.py4
-rw-r--r--ui/app/components/main_panel/email_section.js13
2 files changed, 15 insertions, 2 deletions
diff --git a/src/leap/bitmask/pix.py b/src/leap/bitmask/pix.py
index 519b7c1..043f7d0 100644
--- a/src/leap/bitmask/pix.py
+++ b/src/leap/bitmask/pix.py
@@ -47,6 +47,10 @@ except ImportError:
log = Logger()
+# TODO
+# [ ] pre-authenticate
+
+
def start_pixelated_user_agent(userid, soledad, keymanager):
leap_session = LeapSessionAdapter(
diff --git a/ui/app/components/main_panel/email_section.js b/ui/app/components/main_panel/email_section.js
index e382c9d..8947e38 100644
--- a/ui/app/components/main_panel/email_section.js
+++ b/ui/app/components/main_panel/email_section.js
@@ -94,6 +94,15 @@ export default class EmailSection extends React.Component {
App.show('addressbook', {account: this.props.account})
}
+ openPixelated() {
+ if (bitmaskBrowser) {
+ // we are inside a qtwebkit page that exports the object
+ bitmaskBrowser.openPixelated();
+ } else {
+ window.open("http://localhost:9090");
+ }
+ }
+
openApp() {}
openPrefs() {}
@@ -114,7 +123,7 @@ export default class EmailSection extends React.Component {
let body = null
let header = <h1>Mail</h1>
if (this.state.status == 'on') {
- // button = <Button onClick={this.openKeys}>Addressbook</Button>
+ button = <Button onClick={this.openKeys}>Addressbook</Button>
}
if (this.state.status == 'disabled') {
header = <h1>Mail Disabled</h1>
@@ -123,8 +132,8 @@ export default class EmailSection extends React.Component {
body = (<div>
{message}
<ButtonToolbar>
+ <Button onClick={this.openPixelated}>Open Mail</Button>
<IMAPButton account={this.props.account} />
- <Button onClick={this.openKeys}>Addressbook</Button>
</ButtonToolbar>
</div>)
}