summaryrefslogtreecommitdiff
path: root/src/clojure/io/cons/carddav_sync
diff options
context:
space:
mode:
Diffstat (limited to 'src/clojure/io/cons/carddav_sync')
-rw-r--r--src/clojure/io/cons/carddav_sync/authenticator.clj8
-rw-r--r--src/clojure/io/cons/carddav_sync/authenticator_activity.clj2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/clojure/io/cons/carddav_sync/authenticator.clj b/src/clojure/io/cons/carddav_sync/authenticator.clj
index 2bd6b00..ca90f62 100644
--- a/src/clojure/io/cons/carddav_sync/authenticator.clj
+++ b/src/clojure/io/cons/carddav_sync/authenticator.clj
@@ -4,7 +4,7 @@
(:import android.accounts.AccountManager
android.content.Intent
android.os.Bundle
- [io.cons.carddav_sync authenticator_activity SplashActivity])
+ io.cons.carddav_sync.authenticator_activity)
(:gen-class
:extends android.accounts.AbstractAccountAuthenticator
:state context
@@ -17,12 +17,10 @@
(defn -addAccount
[this response accountType authTokenType requiredFeatures options]
(log-i "addAccount")
- (let [selector (Intent. (.context this) authenticator_activity)
- intent (Intent. (.context this) SplashActivity)
+ (let [intent (Intent. (.context this) authenticator_activity)
bundle (Bundle.)]
- (.putExtra selector AccountManager/KEY_ACCOUNT_AUTHENTICATOR_RESPONSE
+ (.putExtra intent AccountManager/KEY_ACCOUNT_AUTHENTICATOR_RESPONSE
response)
- (.setSelector intent selector)
(.putParcelable bundle AccountManager/KEY_INTENT intent)
bundle))
diff --git a/src/clojure/io/cons/carddav_sync/authenticator_activity.clj b/src/clojure/io/cons/carddav_sync/authenticator_activity.clj
index 1c8535a..bf8025c 100644
--- a/src/clojure/io/cons/carddav_sync/authenticator_activity.clj
+++ b/src/clojure/io/cons/carddav_sync/authenticator_activity.clj
@@ -1,6 +1,7 @@
(ns io.cons.carddav_sync.authenticator_activity
(:use io.cons.carddav_sync.log
[neko.activity :only [defactivity set-content-view!]]
+ [neko.init :only [init]]
[neko.resource :only [get-resource]]
[neko.threading :only [on-ui]]
[neko.ui :only [make-ui]]
@@ -48,6 +49,7 @@
(defn -onCreate
[this savedInstanceState]
(.superOnCreate this savedInstanceState)
+ (init this)
(on-ui
(set-content-view! this
(make-ui [:scroll-view {}