Ensure that Facebook SDK is initialized. Also fixed up FacebookDatum …

…nullable property type checking.
predictive-technology-laboratory · Sep 7, 2015 · 80255cb · 80255cb
1 parent 4c7c099
commit 80255cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Sensus.Android/AndroidMainActivity.cs b/Sensus.Android/AndroidMainActivity.cs
@@ -239,6 +239,15 @@ protected override void OnActivityResult(int requestCode, Result resultCode, Int
                 _activityResultWait.Set();
             }
 
+            // looks like the facebook SDK can become uninitialized during the process of interacting with the Facebook login manager. this 
+            // might happen when Sensus is stopped/destroyed while the user is logging into facebook. check here to ensure that the facebook
+            // SDK is initialized.
+            //
+            // see:  https://insights.xamarin.com/app/Sensus-Production/issues/66
+            //
+            if (!FacebookSdk.IsInitialized)
+                FacebookSdk.SdkInitialize(this);
+
             _facebookCallbackManager.OnActivityResult(requestCode, (int)resultCode, data);
         }
 

diff --git a/Sensus.Android/Probes/Apps/AndroidFacebookProbe.cs b/Sensus.Android/Probes/Apps/AndroidFacebookProbe.cs
@@ -221,9 +221,9 @@ protected override IEnumerable<Datum> Poll(CancellationToken cancellationToken)
 
                                     if (property.PropertyType == typeof(string))
                                         value = responseJSON.GetString(jsonField);
-                                    else if (property.PropertyType == typeof(bool))
+                                    else if (property.PropertyType == typeof(bool?))
                                         value = responseJSON.GetBoolean(jsonField);
-                                    else if (property.PropertyType == typeof(DateTimeOffset))
+                                    else if (property.PropertyType == typeof(DateTimeOffset?))
                                         value = DateTimeOffset.Parse(responseJSON.GetString(jsonField));
                                     else if (property.PropertyType == typeof(List<string>))
                                     {

diff --git a/Sensus.iOS/Probes/Apps/iOSFacebookProbe.cs b/Sensus.iOS/Probes/Apps/iOSFacebookProbe.cs
@@ -128,13 +128,13 @@ protected override IEnumerable<Datum> Poll(CancellationToken cancellationToken)
 
                                                     if (property.PropertyType == typeof(string))
                                                         value = resultDictionary[resultKey].ToString();
-                                                    else if (property.PropertyType == typeof(bool))
+                                                    else if (property.PropertyType == typeof(bool?))
                                                     {
                                                         int parsedBool;
                                                         if (int.TryParse(resultDictionary[resultKey].ToString(), out parsedBool))
                                                             value = parsedBool == 1 ? true : false;
                                                     }
-                                                    else if (property.PropertyType == typeof(DateTimeOffset))
+                                                    else if (property.PropertyType == typeof(DateTimeOffset?))
                                                     {
                                                         DateTimeOffset parsedDateTimeOffset;
                                                         if (DateTimeOffset.TryParse(resultDictionary[resultKey].ToString(), out parsedDateTimeOffset))