Merge branch 'release/v8.0.1.2'

Aptoide · Nov 22, 2016 · 54846e1 · 54846e1
2 parents 9879b16 + 401b652
commit 54846e1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/database/build.gradle b/database/build.gradle
@@ -52,6 +52,9 @@ dependencies {
   debugCompile project(path: ':model', configuration: 'debug')
   releaseCompile project(path: ':model', configuration: 'release')
 
+  debugCompile project(path: ':crashreports', configuration: 'debug')
+  releaseCompile project(path: ':crashreports', configuration: 'release')
+
   //
   // custom libs in folders
   //

diff --git a/database/src/main/java/cm/aptoide/pt/database/accessors/Database.java b/database/src/main/java/cm/aptoide/pt/database/accessors/Database.java
@@ -7,6 +7,7 @@
 
 import android.content.Context;
 import android.text.TextUtils;
+import cm.aptoide.pt.crashreports.CrashReports;
 import cm.aptoide.pt.database.BuildConfig;
 import cm.aptoide.pt.database.schedulers.RealmSchedulers;
 import io.realm.Realm;
@@ -239,31 +240,32 @@ public <E extends RealmObject> Observable<List<E>> getAsList(Class<E> clazz, Str
 
   public <E extends RealmObject> void delete(Class<E> clazz, String key, String value) {
     @Cleanup Realm realm = get();
-    E first = realm.where(clazz).equalTo(key, value).findFirst();
-    if (first != null) {
-      realm.beginTransaction();
-      first.deleteFromRealm();
-      realm.commitTransaction();
-    }
+    E obj = realm.where(clazz).equalTo(key, value).findFirst();
+    deleteObject(realm, obj);
   }
 
   public <E extends RealmObject> void delete(Class<E> clazz, String key, Integer value) {
     @Cleanup Realm realm = get();
-    E first = realm.where(clazz).equalTo(key, value).findFirst();
-    if (first != null) {
-      realm.beginTransaction();
-      first.deleteFromRealm();
-      realm.commitTransaction();
-    }
+    E obj = realm.where(clazz).equalTo(key, value).findFirst();
+    deleteObject(realm, obj);
   }
 
   public <E extends RealmObject> void delete(Class<E> clazz, String key, Long value) {
     @Cleanup Realm realm = get();
-    E first = realm.where(clazz).equalTo(key, value).findFirst();
-    if (first != null) {
-      realm.beginTransaction();
-      first.deleteFromRealm();
-      realm.commitTransaction();
+    E obj = realm.where(clazz).equalTo(key, value).findFirst();
+    deleteObject(realm, obj);
+  }
+
+  private <E extends RealmObject> void deleteObject(Realm realm, E obj) {
+    realm.beginTransaction();
+    try{
+      if (obj != null && obj.isValid()) {
+        obj.deleteFromRealm();
+        realm.commitTransaction();
+      }
+    } catch (Exception ex) {
+      realm.cancelTransaction();
+      CrashReports.logException(ex);
     }
   }
 

diff --git a/vanilla/build.gradle b/vanilla/build.gradle
@@ -128,7 +128,7 @@ android {
       Integer value = getVersionCode("../../aptoideProperties/version.properties",
           "PROD_VERSION_CODE")
       versionCode value
-      versionName "8.0.1.1"
+      versionName "8.0.1.2"
       resValue "string", "authenticatorAccountType", APPLICATION_ID
     }
   }