New driver for Realm 7+

Author: kamgurgul

README.md

@@ -1,7 +1,10 @@
 [ ![Download](https://api.bintray.com/packages/kamgurgul/flipper/flipper-realm-android/images/download.svg?version=1.0.0) ](https://bintray.com/kamgurgul/flipper/flipper-realm-android/1.0.0/link)
 
-Android Realm driver for [Flipper](https://github.com/facebook/flipper). Driver was 
-tested with [Realm](https://github.com/realm/realm-java) versions 5.4.+ and 6.+.
+Android Realm driver for [Flipper](https://github.com/facebook/flipper).
+
+Because of breaking changes between [Realm](https://github.com/realm/realm-java) versions driver is split into two versions:
+* **2.+** for **Realm 7.+**
+* **1.+** for **Realm 5.+** and **Realm 6.+**
 
 Download
 ========
@@ -16,6 +19,11 @@ allprojects {
 }
 ```
 * Dependency:
+Realm version >= 7 (not published yet):
+```kotlin
+implementation "com.kgurgul.flipper:flipper-realm-android:2.0.0"
+```
+Realm version < 7:
 ```kotlin
 implementation "com.kgurgul.flipper:flipper-realm-android:1.0.0"
 ```

build.gradle

@@ -15,16 +15,16 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.60'
-    ext.realm_version = '6.0.1'
-    ext.flipper_version = '0.28.0'
+    ext.kotlin_version = '1.3.72'
+    ext.realm_version = '7.0.0'
+    ext.flipper_version = '0.37.0'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.realm:realm-gradle-plugin:$realm_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'

flipper-realm-android/build.gradle

@@ -21,7 +21,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
 def packageName = 'com.kgurgul.flipper'
-def pluginVersion = '1.0.0'
+def pluginVersion = '2.0.0'
 
 Properties properties = new Properties()
 if (project.rootProject.file('local.properties').canRead()) {

flipper-realm-android/src/main/java/com/kgurgul/flipper/RealmHelper.kt

@@ -19,6 +19,7 @@ package com.kgurgul.flipper
 import io.realm.RealmConfiguration
 import io.realm.RealmFieldType
 import io.realm.internal.OsList
+import io.realm.internal.OsResults
 import io.realm.internal.OsSharedRealm
 import io.realm.internal.Row
 import java.text.SimpleDateFormat
@@ -27,15 +28,15 @@ import java.util.*
 internal object RealmHelper {
 
     private fun getSharedRealm(realmConfiguration: RealmConfiguration): OsSharedRealm {
-        return OsSharedRealm.getInstance(realmConfiguration)
+        return OsSharedRealm.getInstance(realmConfiguration, OsSharedRealm.VersionID.LIVE)
     }
 
     fun getTableNames(realmConfiguration: RealmConfiguration): List<String> {
         return getSharedRealm(realmConfiguration)
             .use { sharedRealm ->
                 val tableNames = mutableListOf<String>()
                 for (i in 0 until sharedRealm.size()) {
-                    tableNames.add(sharedRealm.getTableName(i.toInt()))
+                    tableNames.add(sharedRealm.tablesNames[i.toInt()])
                 }
                 tableNames
             }
@@ -49,12 +50,13 @@ internal object RealmHelper {
             .use { sharedRealm ->
                 val columnNames = mutableListOf<RealmColumnInfo>()
                 val table = sharedRealm.getTable(tableName)
-                for (i in 0 until table.columnCount) {
+                for (columnName in table.columnNames) {
+                    val columnKey = table.getColumnKey(columnName)
                     columnNames.add(
                         RealmColumnInfo(
-                            table.getColumnName(i),
-                            table.getColumnType(i).name,
-                            table.isColumnNullable(i)
+                            columnName,
+                            table.getColumnType(columnKey).name,
+                            table.isColumnNullable(columnKey)
                         )
                     )
                 }
@@ -72,11 +74,12 @@ internal object RealmHelper {
             .use { sharedRealm ->
                 val valueList = mutableListOf<List<Any>>()
                 val table = sharedRealm.getTable(tableName)
-                for (i in start until table.size()) {
-                    val rawCheckedRow = table.getUncheckedRow(i)
+                val osResults = OsResults.createFromQuery(sharedRealm, table.where())
+                for (i in start until osResults.size()) {
+                    val uncheckedRow = osResults.getUncheckedRow(i.toInt())
                     val rowValues = mutableListOf<Any>()
-                    for (j in 0 until rawCheckedRow.columnCount) {
-                        rowValues.add(getRowData(rawCheckedRow, j))
+                    for (columnName in uncheckedRow.columnNames) {
+                        rowValues.add(getRowData(uncheckedRow, columnName))
                     }
                     valueList.add(rowValues)
                     if (valueList.size == count) {
@@ -90,80 +93,73 @@ internal object RealmHelper {
     fun getRowsCount(realmConfiguration: RealmConfiguration, tableName: String): Long {
         return getSharedRealm(realmConfiguration)
             .use { sharedRealm ->
-                sharedRealm.getTable(tableName).size()
+                OsResults
+                    .createFromQuery(sharedRealm, sharedRealm.getTable(tableName).where())
+                    .size()
             }
     }
 
-    private fun getRowData(row: Row, index: Long): Any {
-        return when (row.getColumnType(index)) {
+    private fun getRowData(row: Row, columnName: String): Any {
+        val columnKey = row.getColumnKey(columnName)
+        return when (row.getColumnType(columnKey)) {
             RealmFieldType.INTEGER -> {
-                if (row.isNull(index)) {
+                if (row.isNull(columnKey)) {
                     NULL
                 } else {
-                    row.getLong(index).toString()
+                    row.getLong(columnKey).toString()
                 }
             }
             RealmFieldType.BOOLEAN -> {
-                if (row.isNull(index)) {
+                if (row.isNull(columnKey)) {
                     NULL
                 } else {
-                    row.getBoolean(index)
+                    row.getBoolean(columnKey)
                 }
             }
             RealmFieldType.STRING -> {
-                if (row.isNull(index)) {
+                if (row.isNull(columnKey)) {
                     NULL
                 } else {
-                    row.getString(index)
+                    row.getString(columnKey)
                 }
             }
             RealmFieldType.BINARY -> {
-                if (row.isNull(index)) {
+                if (row.isNull(columnKey)) {
                     NULL
                 } else {
-                    row.getBinaryByteArray(index).toString()
+                    row.getBinaryByteArray(columnKey).toString()
                 }
             }
             RealmFieldType.DATE -> {
-                if (row.isNull(index)) {
+                if (row.isNull(columnKey)) {
                     NULL
                 } else {
-                    formatDate(row.getDate(index))
+                    formatDate(row.getDate(columnKey))
                 }
             }
             RealmFieldType.FLOAT -> {
-                if (row.isNull(index)) {
+                if (row.isNull(columnKey)) {
                     NULL
                 } else {
-                    when (val aFloat = row.getFloat(index)) {
-                        Float.NaN -> "NaN"
-                        Float.POSITIVE_INFINITY -> "Infinity"
-                        Float.NEGATIVE_INFINITY -> "-Infinity"
-                        else -> aFloat.toString()
-                    }
+                    row.getFloat(columnKey).toString()
                 }
             }
             RealmFieldType.DOUBLE -> {
-                if (row.isNull(index)) {
+                if (row.isNull(columnKey)) {
                     NULL
                 } else {
-                    when (val aDouble = row.getDouble(index)) {
-                        Double.NaN -> "NaN"
-                        Double.POSITIVE_INFINITY -> "Infinity"
-                        Double.NEGATIVE_INFINITY -> "-Infinity"
-                        else -> aDouble.toString()
-                    }
+                    row.getDouble(columnKey).toString()
                 }
             }
             RealmFieldType.OBJECT -> {
-                if (row.isNullLink(index)) {
+                if (row.isNullLink(columnKey)) {
                     NULL
                 } else {
-                    row.getLink(index).toString()
+                    row.getLink(columnKey).toString()
                 }
             }
             RealmFieldType.LIST -> {
-                formatList(row.getModelList(index))
+                formatList(row.getModelList(columnKey))
             }
             RealmFieldType.INTEGER_LIST,
             RealmFieldType.FLOAT_LIST,
@@ -172,11 +168,11 @@ internal object RealmHelper {
             RealmFieldType.BINARY_LIST,
             RealmFieldType.DATE_LIST,
             RealmFieldType.STRING_LIST -> {
-                if (row.isNullLink(index)) {
+                if (row.isNullLink(columnKey)) {
                     NULL
                 } else {
-                    val columnType = row.getColumnType(index)
-                    formatValueList(row.getValueList(index, columnType), columnType)
+                    val columnType = row.getColumnType(columnKey)
+                    formatValueList(row.getValueList(columnKey, columnType), columnType)
                 }
             }
             else -> "[FLIPPER_UNKNOWN_VALUE]"
@@ -193,7 +189,7 @@ internal object RealmHelper {
         val size = osList.size()
         sb.append("{")
         for (i in 0 until size) {
-            sb.append(osList.getUncheckedRow(i).index)
+            sb.append(osList.getUncheckedRow(i).objectKey)
             sb.append(',')
         }
         if (size > 0) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,21 +1,6 @@
-#
-# Copyright 2019 KG Soft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#Sat Nov 16 17:32:03 CET 2019
+#Wed May 27 15:43:27 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

sample/build.gradle

@@ -43,11 +43,11 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
-    debugImplementation 'com.facebook.flipper:flipper:0.28.0'
-    debugImplementation 'com.facebook.soloader:soloader:0.8.0'
+    debugImplementation "com.facebook.flipper:flipper:$flipper_version"
+    debugImplementation 'com.facebook.soloader:soloader:0.8.2'
 
     releaseImplementation 'com.facebook.flipper:flipper-noop:0.28.0'
 

sample/src/main/java/com/kgurgul/flipper/realm/App.kt

@@ -33,6 +33,8 @@ class App : Application() {
     override fun onCreate() {
         super.onCreate()
 
+        SoLoader.init(this, false)
+
         Realm.init(this)
         val realmConfiguration = RealmConfiguration.Builder()
             .name("testRealm")
@@ -41,7 +43,6 @@ class App : Application() {
             .build()
         Realm.setDefaultConfiguration(realmConfiguration)
 
-        SoLoader.init(this, false)
         if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
             val client = AndroidFlipperClient.getInstance(this)
             client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))