Optimize registration flow

app/src/main/java/org/unifiedpush/distributor/nextpush/api/ApiUtils.kt

@@ -172,13 +172,7 @@ private fun cCreateApp(context: Context,
                        appName: String,
                        connectorToken: String,
                        callback: ()->Unit) {
-    val db = getDb(context)
+    // The unity of connector token must already be checked here
-    if (db.isRegistered(appName, connectorToken)) {
-        Log.i("RegisterService","$appName already registered")
-        createQueue.remove(connectorToken)
-        callback()
-        return
-    }
     val parameters = mutableMapOf(
         "deviceId" to getDeviceId(context)!!,
         "appName" to appName
@@ -199,6 +193,7 @@ private fun cCreateApp(context: Context,
                      * It is printed and not thrown by SQLiteDatabase.java
                      * So we can't catch it
                      */
+                    val db = getDb(context)
                     db.registerApp(appName, connectorToken, response.token)
                 } else {
                     Log.d(TAG, "An error occurred while creating the application.")

app/src/main/java/org/unifiedpush/distributor/nextpush/distributor/DistributorUtils.kt

@@ -11,6 +11,10 @@ import org.unifiedpush.distributor.nextpush.account.getUrl
 
 private const val TAG = "DistributorUtils"
 
+const val TOKEN_NEW = "token_new"
+const val TOKEN_REGISTERED_OK = "token_registered_ok"
+const val TOKEN_NOK = "token_nok"
+
 private var db : MessagingDatabase? = null
 
 fun getDb(context: Context): MessagingDatabase {
@@ -94,10 +98,13 @@ fun getEndpoint(context: Context, connectorToken: String): String {
     return "${getUrl(context)}/push/$appToken"
 }
 
-fun isTokenOk(context: Context, connectorToken: String, app: String): Boolean {
+fun checkToken(context: Context, connectorToken: String, app: String): String {
     val db = getDb(context)
     if (connectorToken !in db.listTokens()) {
-        return true
+        return TOKEN_NEW
     }
-    return db.getPackageName(connectorToken) == app
+    if (db.isRegistered(app, connectorToken)) {
+        return TOKEN_REGISTERED_OK
+    }
+    return TOKEN_NOK
 }

app/src/main/java/org/unifiedpush/distributor/nextpush/receivers/RegisterBroadcastReceiver.kt

@@ -33,7 +33,15 @@ class RegisterBroadcastReceiver : BroadcastReceiver() {
                     Log.w(TAG,"Trying to register an app without packageName")
                     return
                 }
-                if (!isConnected(context!!, showDialog = false)) {
+                when (checkToken(context!!, connectorToken, application)) {
+                    TOKEN_REGISTERED_OK -> sendEndpoint(context.applicationContext, connectorToken)
+                    TOKEN_NOK -> sendRegistrationFailed(
+                        context,
+                        application,
+                        connectorToken
+                    )
+                    TOKEN_NEW -> {
+                        if (!isConnected(context, showDialog = false)) {
                             sendRegistrationFailed(
                                 context,
                                 application,
@@ -42,14 +50,6 @@ class RegisterBroadcastReceiver : BroadcastReceiver() {
                             )
                             return
                         }
-                if (!isTokenOk(context, connectorToken, application)) {
-                    sendRegistrationFailed(
-                        context,
-                        application,
-                        connectorToken
-                    )
-                    return
-                }
                         if (connectorToken !in createQueue) {
                             createQueue.add(connectorToken)
                             apiCreateApp(
@@ -63,6 +63,8 @@ class RegisterBroadcastReceiver : BroadcastReceiver() {
                             Log.d(TAG, "Already registering $connectorToken")
                         }
                     }
+                }
+            }
             ACTION_UNREGISTER ->{
                 Log.i(TAG,"UNREGISTER")
                 val connectorToken = intent.getStringExtra(EXTRA_TOKEN)?: ""