summaryrefslogtreecommitdiff
path: root/client/Piztor/src/com/macaroon/piztor/InitAct.java
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-08-28 16:32:50 +0800
committerTeddy <ted.sybil@gmail.com>2013-08-28 16:32:50 +0800
commit10af199a81c3b7ca338a7aeb3ab599ff1be7ecb1 (patch)
tree06c26b1471f431a53252fd3629a5b561bdf21c7b /client/Piztor/src/com/macaroon/piztor/InitAct.java
parent1bc497952316e08e73c71d6839a9e42e40196fb6 (diff)
parent0a8315a94d8ed1252f3f96d4ca41ddc632c3bc98 (diff)
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/src/com/macaroon/piztor/InitAct.java')
-rw-r--r--client/Piztor/src/com/macaroon/piztor/InitAct.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Piztor/src/com/macaroon/piztor/InitAct.java b/client/Piztor/src/com/macaroon/piztor/InitAct.java
index 4d2b656..8a7ad7a 100644
--- a/client/Piztor/src/com/macaroon/piztor/InitAct.java
+++ b/client/Piztor/src/com/macaroon/piztor/InitAct.java
@@ -9,7 +9,7 @@ public class InitAct extends PiztorAct {
protected void onCreate(Bundle savedInstanceState) {
id = "initAct";
super.onCreate(savedInstanceState);
- AppMgr.init();
+ AppMgr.init(getApplicationContext());
AppMgr.transam.setTimeOutTime(5000);
setContentView(R.layout.activity_init);
}
@@ -17,7 +17,7 @@ public class InitAct extends PiztorAct {
@Override
protected void onStart() {
super.onStart();
- if (UserInfo.token == null)
+ if (Infomation.token == null)
AppMgr.trigger(AppMgr.noToken);
else {
//TODO jump to main