v0.0.10

Author: efraespada

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img width="10%" vspace="20" src="https://github.com/rotorlab/database-kotlin/raw/develop/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png"></p>
+<p align="center"><img width="10%" vspace="20" src="https://github.com/rotorlab/database-kotlin/raw/develop/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png"></p>
 
 # Rotor Core for Android
 
@@ -11,7 +11,21 @@ Check out [rotor-server repo](https://github.com/rotorlab/server-node) for more
 
 ### Usage
 - Import library:
-
+```groovy
+buildscript {
+ 
+    ext.kotlin_version = '1.2.30'
+    ext.rotor_version = '0.0.10'
+ 
+    repositories {
+        jcenter()
+    }
+ 
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+```
 ```groovy
 android {
     defaultConfig {
@@ -20,7 +34,9 @@ android {
 }
  
 dependencies {
-    implementation 'com.rotor:core:0.0.5'
+    implementation "com.rotor:core:$rotor_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.google.code.gson:gson:2.8.2'
 }
 ```
 Initialize Rotor Core on your app. `connected()` method is fired only when initialized method is called and core is connected to Redis server. `reconnecting()` will be called when core is trying to connect to redis.

app/build.gradle

@@ -1,19 +1,19 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 26
+
     defaultConfig {
         applicationId "com.efraespada.chappykotlin"
         minSdkVersion 14
         targetSdkVersion 26
         versionCode 1
-        versionName "1.0"
+        versionName rotor_version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -30,5 +30,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    implementation 'com.rotor:core:0.0.5'
+    implementation 'com.rotor:core:0.0.10'
 }

build.gradle

@@ -2,6 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.2.30'
+    ext.rotor_version = '0.0.10'
     repositories {
         google()
         jcenter()

core/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "0.0.9"
+version = rotor_version
 
 android {
     compileSdkVersion 26
@@ -50,7 +50,7 @@ install {
         pom {
             project {
                 packaging 'aar'
-                name 'Kotlin core for Rotor client'
+                name 'Core module for Rotor client (kotlin)'
                 url siteUrl
                 // Set your license
                 licenses {

core/src/main/java/com/rotor/core/Rotor.kt

@@ -11,6 +11,8 @@ import android.util.Log
 import com.rotor.core.interfaces.InternalServiceListener
 import com.rotor.core.interfaces.StatusListener
 import com.google.gson.Gson
+import com.rotor.core.RotorService.Companion.PREF_CONFIG
+import com.rotor.core.RotorService.Companion.PREF_ID
 import com.rotor.core.interfaces.BuilderFace
 import org.json.JSONObject
 
@@ -35,10 +37,10 @@ class Rotor {
 
         var gson: Gson? = null
         var debug: Boolean? = null
-        var initialized: Boolean? = null
+        var initializing: Boolean? = null
         var builders: HashMap<Builder, BuilderFace> ? = null
 
-        val serviceConnection: ServiceConnection = object : ServiceConnection {
+        @JvmStatic val serviceConnection: ServiceConnection = object : ServiceConnection {
 
             override fun onServiceConnected(className: ComponentName, service: IBinder) {
                 if (service is RotorService.FBinder) {
@@ -47,8 +49,8 @@ class Rotor {
                     rotorService?.listener = object : InternalServiceListener {
 
                         override fun connected() {
-                            if (initialized!!) {
-                                initialized = false
+                            if (initializing!!) {
+                                initializing = false
                                 statusListener.connected()
                             }
                         }
@@ -57,6 +59,9 @@ class Rotor {
                             statusListener.reconnecting()
                         }
                     }
+                    if (initializing!!) {
+                        rotorService?.startService()
+                    }
                     if (debug!!) Log.e(TAG, "instanced service")
                 }
             }
@@ -80,21 +85,21 @@ class Rotor {
             }
             Companion.debug = false
             Companion.gson = Gson()
-            val shared = context.getSharedPreferences("flamebase_config", MODE_PRIVATE)
-            Companion.id = shared.getString("flamebase_id", null)
+            val shared = context.getSharedPreferences(PREF_CONFIG, MODE_PRIVATE)
+            Companion.id = shared.getString(PREF_ID, null)
             if (Companion.id == null) {
                 Companion.id = generateNewId()
             }
 
-            Companion.initialized = true
+            Companion.initializing = true
 
             start()
         }
 
         private fun generateNewId(): String {
             val id = Settings.Secure.getString(context!!.getContentResolver(), Settings.Secure.ANDROID_ID)
-            val shared = context!!.getSharedPreferences("flamebase_config", MODE_PRIVATE).edit()
-            shared.putString("flamebase_id", id)
+            val shared = context!!.getSharedPreferences(PREF_CONFIG, MODE_PRIVATE).edit()
+            shared.putString(PREF_ID, id)
             shared.apply()
             return id
         }

core/src/main/java/com/rotor/core/RotorService.kt

@@ -22,18 +22,21 @@ import java.util.*
  */
 class RotorService: Service() {
 
+    companion object {
+        internal val PREF_ID = "rotor_id"
+        internal val PREF_URL = "rotor_url"
+        internal val PREF_CONFIG = "rotor_config"
+    }
     private val TAG = RotorService::class.java.simpleName
-    private val PREF_KEY = "rotor_url"
-    private val PREF_CONFIG_KEY = "rotor_config"
     private val EXCEPTION_NO_SERVER_URL = "No URL was defined for Rotor Server"
-    internal var binder: FBinder ? = null
+    internal var binder: FBinder = FBinder()
     internal var initialized: Boolean = false
     internal var client: RedisClient ? = null
     internal var moment: Long = 0
     internal var connection: RedisPubSubConnection<String, String> ? = null
     internal var sc: ServiceConnection ? = null
-    internal var listener: InternalServiceListener? = null
     internal var connectedToRedis: Boolean = false
+    var listener: InternalServiceListener? = null
 
     private val redisPubSubListener = object : RedisPubSubListener<String, String> {
         override fun message(s: String, s2: String) {
@@ -90,11 +93,11 @@ class RotorService: Service() {
         if (client == null) {
             var url = Rotor.urlRedis
             if (url?.length == 0) {
-                val shared = applicationContext.getSharedPreferences(PREF_CONFIG_KEY, Context.MODE_PRIVATE)
-                url = shared.getString(PREF_KEY, null)
+                val shared = applicationContext.getSharedPreferences(PREF_CONFIG, Context.MODE_PRIVATE)
+                url = shared.getString(PREF_URL, null)
             } else {
-                val shared = applicationContext.getSharedPreferences(PREF_CONFIG_KEY, Context.MODE_PRIVATE).edit()
-                shared.putString(PREF_KEY, url)
+                val shared = applicationContext.getSharedPreferences(PREF_CONFIG, Context.MODE_PRIVATE).edit()
+                shared.putString(PREF_URL, url)
                 shared.apply()
             }
 
@@ -164,7 +167,7 @@ class RotorService: Service() {
     fun setListener(listener: InternalServiceListener) {
         [email protected] = listener
 
-        if (initialized) {
+        if (initializing) {
             [email protected]()
         }
     }*/