Merge pull request #23 from avohq/fix-start-race-condition

Fix start race condition
avohq · Jan 14, 2022 · b9d0a57 · b9d0a57
2 parents 3393453 + 5b8bb73
commit b9d0a57
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2
+
+Fixed a race condition that caused some of the early events in the app lifecycle to be not reported.
+
 ## 2.0.1
 
 Disabled batching in the dev mode by default.

diff --git a/avoinspector/.gitignore b/avoinspector/.gitignore
@@ -1,2 +1,4 @@
 /build
-sentry.properties
+sentry.properties
+/.idea
+local.properties
diff --git a/avoinspector/build.gradle b/avoinspector/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 30
         versionCode 4
-        versionName "2.0.1"
+        versionName "2.0.2"
 
         testInstrumentationRunner "AndroidJUnit4"
         consumerProguardFiles 'consumer-rules.pro'
@@ -65,15 +65,15 @@ afterEvaluate {
 
                 groupId = 'com.github.avohq'
                 artifactId = 'prod'
-                version = '2.0.1'
+                version = '2.0.2'
             }
 
             development(MavenPublication) {
                 from components.developmentRelease
 
                 groupId = 'com.github.avohq'
                 artifactId = 'dev'
-                version = '2.0.1'
+                version = '2.0.2'
             }
         }
     }

diff --git a/avoinspector/src/main/java/app/avo/inspector/AvoBatcher.java b/avoinspector/src/main/java/app/avo/inspector/AvoBatcher.java
@@ -57,6 +57,7 @@ public void run() {
                 synchronized (events) {
                     SharedPreferences.Editor editor = sharedPrefs.edit();
                     editor.putString(avoInspectorBatchKey, new JSONArray(events).toString()).apply();
+                    events = Collections.synchronizedList(new ArrayList<Map<String, Object>>());
                 }
             }
         }).start();
@@ -71,7 +72,7 @@ private void removeExtraElements() {
 
     void enterForeground() {
         final String savedData = sharedPrefs.getString(avoInspectorBatchKey, null);
-        events = Collections.synchronizedList(new ArrayList<Map<String, Object>>());
+
         if (savedData != null) {
             new Thread(new Runnable() {
                 @Override
@@ -91,9 +92,11 @@ public void run() {
                                 }
 
                                 events.add(event);
-                            } catch (JSONException ignored) {}
+                            } catch (JSONException ignored) {
+                            }
                         }
-                    } catch (JSONException ignored) { }
+                    } catch (JSONException ignored) {
+                    }
                     postAllAvailableEvents(true);
                 }
             }).start();

diff --git a/avoinspectorexample/src/main/java/app/avo/avoinspectorexample/KotlinActivity.kt b/avoinspectorexample/src/main/java/app/avo/avoinspectorexample/KotlinActivity.kt
@@ -15,6 +15,8 @@ class KotlinActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        AvoInspector.setBatchSize(0)
+
         val avoInspector = AvoInspector("MY_API_KEY",
                 application, AvoInspectorEnv.Dev,this)
 

diff --git a/avoinspectorexample/src/main/java/app/avo/avoinspectorexample/MainActivity.java b/avoinspectorexample/src/main/java/app/avo/avoinspectorexample/MainActivity.java
@@ -35,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(view);
 
         final AvoInspector avoInspector = new AvoInspector("MYEfq8E4FZ6Xkxlo9mTc",
-                getApplication(), AvoInspectorEnv.Staging, this);
+                getApplication(), AvoInspectorEnv.Dev, this);
 
         binding.sendEventButton.setOnClickListener(view1 -> {
             String eventName = binding.eventNameInput.getText().toString();