bumped to 0.9.12 and removed the registerCallbacks method

crankycoder · crankycoder · commit a0d283657b14 · 2015-07-07T13:24:26.000-04:00
diff --git a/android/src/main/java/org/mozilla/firefoxaccounts/MainApp.java b/android/src/main/java/org/mozilla/firefoxaccounts/MainApp.java
@@ -40,10 +40,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         String app_name = getResources().getString(R.string.app_name);
         FxAGlobals fxa = new FxAGlobals();
-
-        fxa.registerCallbacks((IFxACallbacks) this);
-
-        fxa.startIntentListening(this, app_name);
+        fxa.startIntentListening((Context)this, (IFxACallbacks) this, app_name);
 
         setContentView(R.layout.appmainexample);
     }
diff --git a/libraries/fxa/build.gradle b/libraries/fxa/build.gradle
@@ -1,7 +1,7 @@
 // each of the version numbers must be 0-99
 def versionMajor = 0 
 def versionMinor = 9 // minor feature releases
-def versionPatch = 11 // This should be bumped for hot fixes
+def versionPatch = 12 // This should be bumped for hot fixes
 
 // Double check the versioning
 for (versionPart in [versionPatch, versionMinor, versionMajor]) {
diff --git a/libraries/fxa/src/main/java/org/mozilla/accounts/fxa/FxAGlobals.java b/libraries/fxa/src/main/java/org/mozilla/accounts/fxa/FxAGlobals.java
@@ -50,17 +50,18 @@ public void onReceive(Context context, Intent intent) {
     };
     private IFxACallbacks callbackSite = null;
 
-    public void startIntentListening(Context ctx, String app_name) {
+    public void startIntentListening(Context ctx, IFxACallbacks iFxACallbacks, String app_name) {
         // Clobber the FxAGlobals so that the user-agent for the FxA client will be sensible
         FxAGlobals.appVersionName = BuildConfig.VERSION_NAME;
         FxAGlobals.appVersionCode = BuildConfig.VERSION_CODE;
         FxAGlobals.appName = app_name;
 
+        callbackSite = iFxACallbacks;
+
         IntentFilter intentFilter = new IntentFilter();
         Intents.registerFxaIntents(intentFilter);
 
-        LocalBroadcastManager
-                .getInstance(ctx.getApplicationContext())
+        LocalBroadcastManager.getInstance(ctx.getApplicationContext())
                 .registerReceiver(callbackReceiver, intentFilter);
     }
 
@@ -150,9 +151,6 @@ private void processDisplayNameWrite(Intent intent, boolean success) {
         callbackSite.processDisplayNameWrite();
     }
 
-    public void registerCallbacks(IFxACallbacks iFxACallbacks) {
-        callbackSite = iFxACallbacks;
-    }
 }
 
 
