close some url connections and streams. add connectivity change to test-app manifest. add a few more exception handlers.

Author: thomaszurkan-optimizely

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClient.java

@@ -47,7 +47,7 @@ public class OptimizelyClient {
     private final Logger logger;
 
     @Nullable private Optimizely optimizely;
-    @Nullable private Map<String, String> defaultAttributes;
+    @NonNull private Map<String, String> defaultAttributes;
 
     OptimizelyClient(@Nullable Optimizely optimizely, @NonNull Logger logger) {
         this.optimizely = optimizely;
@@ -86,7 +86,7 @@ protected void setDefaultAttributes(@NonNull Map<String, String> attrs) {
      * @return a new map of both the default attributes and attributes passed in.
      */
     private Map<String, String> getAllAttributes(@NonNull Map<String, String> attrs) {
-        Map<String,String> combinedMap = new HashMap<String,String>(defaultAttributes);
+        Map<String,String> combinedMap = new HashMap<>(defaultAttributes);
 
         // this essentially overrides defaultAttributes if the attrs passed in have the same key.
         combinedMap.putAll(attrs);

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyDefaultAttributes.java

@@ -70,7 +70,7 @@ static Map<String, String> buildDefaultAttributesMap(Context context, Logger log
         }
 
 
-        Map<String, String> attrMap = new HashMap<String, String>();
+        Map<String, String> attrMap = new HashMap<>();
 
         attrMap.put(DEVICE_MODEL_KEY, androidDeviceModel);
         attrMap.put(SDK_VERSION_KEY, androidSdkVersionName);

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java

@@ -58,8 +58,8 @@ public class OptimizelyManager {
             LoggerFactory.getLogger(OptimizelyClient.class));
 
     @NonNull private DatafileHandler datafileHandler;
-    @NonNull private final long datafileDownloadInterval;
-    @NonNull private final long eventDispatchInterval;
+    private final long datafileDownloadInterval;
+    private final long eventDispatchInterval;
     @Nullable private EventHandler eventHandler = null;
     @NonNull private ErrorHandler errorHandler;
     @NonNull private Logger logger;
@@ -323,6 +323,7 @@ public String getProjectId() {
         return projectId;
     }
 
+    @NonNull
     public DatafileHandler getDatafileHandler() {
         return datafileHandler;
     }
@@ -390,6 +391,7 @@ private OptimizelyClient buildOptimizely(@NonNull Context context, @NonNull Stri
         return new OptimizelyClient(optimizely, LoggerFactory.getLogger(OptimizelyClient.class));
     }
 
+    @NonNull
     @VisibleForTesting
     public UserProfileService getUserProfileService() {
         return userProfileService;

datafile-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DatafileClient.java

@@ -89,7 +89,12 @@ public String execute() {
                     return null;
                 } finally {
                     if (urlConnection != null) {
-                        urlConnection.disconnect();
+                        try {
+                            urlConnection.disconnect();
+                        }
+                        catch (Exception e) {
+                            logger.error("Error closing connection", e);
+                        }
                     }
                 }
             }

event-handler/src/main/java/com/optimizely/ab/android/event_handler/Event.java

@@ -22,8 +22,8 @@
  * Event model
  */
 class Event {
-    private URL url;
-    private String requestBody;
+    private final URL url;
+    private final String requestBody;
 
     Event(URL url, String requestBody) {
         this.url = url;

event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventClient.java

@@ -30,9 +30,9 @@
  * Makes network requests related to events
  */
 class EventClient {
-    private Client client;
+    private final Client client;
     // Package private and non final so it can easily be mocked for tests
-    private Logger logger;
+    private final Logger logger;
 
     EventClient(Client client, Logger logger) {
         this.client = client;
@@ -43,9 +43,10 @@ boolean sendEvent(final Event event) {
         Client.Request<Boolean> request = new Client.Request<Boolean>() {
             @Override
             public Boolean execute() {
+                HttpURLConnection urlConnection = null;
                 try {
                     logger.info("Dispatching event: {}", event);
-                    HttpURLConnection urlConnection = client.openConnection(event.getURL());
+                    urlConnection = client.openConnection(event.getURL());
 
                     if (urlConnection == null) {
                         return Boolean.FALSE;
@@ -71,6 +72,20 @@ public Boolean execute() {
                     logger.error("Unable to send event: {}", event, e);
                     return Boolean.FALSE;
                 }
+                catch (Exception e) {
+                    logger.error("Unable to send event: {}", event, e);
+                    return Boolean.FALSE;
+                }
+                finally {
+                    if (urlConnection != null) {
+                        try {
+                            urlConnection.disconnect();
+                        }
+                        catch (Exception e) {
+                            logger.error("Unable to close connection", e);
+                        }
+                    }
+                }
             }
         };
 

event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventDAO.java

@@ -37,8 +37,9 @@
  */
 class EventDAO {
 
-    @NonNull Logger logger;
-    @NonNull private EventSQLiteOpenHelper dbHelper;
+    @NonNull
+    final Logger logger;
+    @NonNull private final EventSQLiteOpenHelper dbHelper;
 
     private EventDAO(@NonNull EventSQLiteOpenHelper dbHelper, @NonNull Logger logger) {
         this.dbHelper = dbHelper;

shared/src/main/java/com/optimizely/ab/android/shared/Cache.java

@@ -108,6 +108,9 @@ public String load(String filename) {
             } catch (IOException e) {
                 logger.warn("Unable to close file {}.", filename);
             }
+            catch (Exception e) {
+                logger.warn("Unable to close file {}.", filename);
+            }
         }
     }
 
@@ -135,6 +138,10 @@ public boolean save(String filename, String data) {
                 } catch (IOException e) {
                     logger.warn("Unable to close file {}.", filename);
                 }
+                catch (Exception e) {
+                    logger.warn("Unable to close file {}.", filename);
+
+                }
             }
         }
     }

shared/src/main/java/com/optimizely/ab/android/shared/Client.java

@@ -100,14 +100,21 @@ public void saveLastModified(@NonNull URLConnection urlConnection) {
 
     @Nullable
     public String readStream(@NonNull URLConnection urlConnection) {
+        Scanner scanner = null;
         try {
             InputStream in = new BufferedInputStream(urlConnection.getInputStream());
-            Scanner s = new Scanner(in).useDelimiter("\\A");
-            return s.hasNext() ? s.next() : "";
+            scanner = new Scanner(in).useDelimiter("\\A");
+            return scanner.hasNext() ? scanner.next() : "";
         } catch (Exception e) {
             logger.warn("Error reading urlConnection stream.", e);
             return null;
         }
+        finally {
+            if (scanner != null) {
+                // We assume that closing the scanner will close the associated input stream.
+                scanner.close();
+            }
+        }
     }
 
     /**

test-app/src/main/AndroidManifest.xml

@@ -59,6 +59,7 @@
              <intent-filter>
                  <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                  <action android:name="android.intent.action.BOOT_COMPLETED" />
+                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
              </intent-filter>
          </receiver>
         <!--
@@ -72,6 +73,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>