Merge pull request #64 from sentry-demos/perf-issues-db_main_thread

upgrade SDK with plugin 3.11.1 and add perf issues db main thread

Author: sdzhong

app-debug.apk

@@ -1,7 +1,7 @@
 import java.sql.Wrapper
 
 buildscript {
-    ext.kotlin_version= '1.8.0'
+    ext.kotlin_version= '1.8.20'
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id "io.sentry.android.gradle" version "3.8.0"
+    id "io.sentry.android.gradle" version "3.11.1"
 }
 
 apply plugin: 'com.android.application'
@@ -42,8 +42,8 @@ android {
         applicationId "com.example.vu.android"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 26
-        versionName "2.4.5"
+        versionCode 27
+        versionName "2.5.0"
 
         externalNativeBuild {
             cmake {
@@ -91,9 +91,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation group: 'androidx.constraintlayout', name: 'constraintlayout', version: '1.1.3'
-    implementation 'io.sentry:sentry-android:6.20.0'
-    implementation 'io.sentry:sentry-android-okhttp:6.20.0'
-    implementation 'io.sentry:sentry-android-fragment:6.20.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.navigation:navigation-fragment:2.5.3'
     implementation 'androidx.navigation:navigation-ui:2.5.3'

app-release.apk

@@ -13,14 +13,12 @@ public abstract class AppDatabase extends RoomDatabase {
 
     private static volatile AppDatabase INSTANCE;
     //singleton recommended
-    static AppDatabase getInstance(Context context){
-        if(INSTANCE == null){
-            synchronized (AppDatabase.class){
-                if(INSTANCE == null){
-                    INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
-                            AppDatabase.class,"AppDatabase").build();
-                }
-            }
+    public static synchronized AppDatabase getInstance(Context context){
+        if (INSTANCE == null){
+            INSTANCE = Room.databaseBuilder(context.getApplicationContext(), 
+            AppDatabase.class,"AppDatabase")
+            .allowMainThreadQueries()
+            .build();
         }
         return INSTANCE;
     }

app/build.gradle

@@ -9,6 +9,8 @@
 import android.widget.TextView;
 
 import androidx.fragment.app.FragmentTransaction;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.example.vu.android.MainActivity;
 import com.example.vu.android.MyBaseActivity;
@@ -25,10 +27,32 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_empowerplant);
+        dbQuery();
         addAttachment(true);
         this.loadFragmentList();
     }
 
+    public void dbQuery() {
+        List<StoreItem> tmpStoreItems = new ArrayList<StoreItem>();
+        for (int i = 0; i < 30; i++) {
+                StoreItem storeitem = new StoreItem();
+                storeitem.setName("tmp");
+                storeitem.setSku("tmp");
+                storeitem.setPrice(i);
+                storeitem.setImage("tmp");
+                storeitem.setItemId(i);
+                storeitem.setQuantity(1);
+                tmpStoreItems.add(storeitem);
+            }
+        
+        AppDatabase.getInstance(getApplicationContext())
+                .StoreItemDAO().insertAll(tmpStoreItems);
+                
+        AppDatabase.getInstance(getApplicationContext())
+                .StoreItemDAO().deleteAll();
+        
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.

app/src/main/java/com/example/vu/android/empowerplant/AppDatabase.java

@@ -12,6 +12,9 @@ public interface StoreItemDAO {
     @Query("SELECT * FROM storeitem")
     List<StoreItem> getAll();
 
+    @Query("DELETE FROM storeitem")
+    public void deleteAll();
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insertAll(List<StoreItem> storeItems);
     //This assumes that PKs of demo data are static. Dynamically generated skus/product ids could problematically accumulate entries across simulations.

app/src/main/java/com/example/vu/android/empowerplant/EmpowerPlantActivity.java

@@ -1,6 +1,6 @@
-#Mon Mar 28 08:58:46 PDT 2022
+#Sun Jul 02 13:22:01 PDT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists