Bugfix: remove nonconfigurable directories from kin storage path (#30)

* removed environment separating directories

* all: version bump to 2.0.0

README.md

@@ -23,7 +23,7 @@ buildscript {
     ext {
         versions = [:]
         
-        versions.kin = "1.0.1"
+        versions.kin = "2.0.0"
     }
 }
 dependencies {

base/src/main/java/org/kin/sdk/base/models/SDKConfig.kt

@@ -2,6 +2,6 @@ package org.kin.sdk.base.models
 
 object SDKConfig {
     const val platform = "JVM"
-    const val versionString = "1.0.1"
+    const val versionString = "2.0.0"
     val systemUserAgent by lazy { System.getProperty("http.agent") ?: "JVM/unspecified" }
 }

base/src/main/java/org/kin/sdk/base/storage/KinFileStorage.kt

@@ -234,9 +234,9 @@ class KinFileStorage @JvmOverloads internal constructor(
     }
 
     override fun getOrCreateCID(): String {
-        val exisingkinConfig = getKinConfig()
-        return if (exisingkinConfig.isPresent) {
-            exisingkinConfig.get()!!.cid
+        val existingkinConfig = getKinConfig()
+        return if (existingkinConfig.isPresent) {
+            existingkinConfig.get()!!.cid
         } else {
             val newCid = UUID.randomUUID().toString()
             val newKinConfig = StorageKinConfig.newBuilder()
@@ -525,22 +525,18 @@ class KinFileStorage @JvmOverloads internal constructor(
 
     /**
      * File Structure
-     * Environment Directory: <context.getFilesDir>/env/<env passcode in hex>/
-     * Config: <Environment Directory>/config
-     * Account Directory: <Environment Directory>/kin_accounts/<public key>
+     * Config: <Base Directory>/config
+     * Account Directory: <Base Directory>/kin_accounts/<account hash>
      * KinAccount object: <Account Directory>/account_info
      * KinTransactions: <Account Directory>/<account_id>_transactions/<account_id>_transactions
      * Invoices: <Account Directory>/<account_id>_invoices/<account_id>_invoices
      */
 
-    private fun envDirectory(): String =
-        "$filesDir/env/${Hex.encodeHexString(networkEnvironment.networkPassphrase.toByteArray())}"
-
     private fun directoryForConfig(): String =
-        "${envDirectory()}/"
+        "$filesDir/"
 
     private fun directoryForAllAccounts(): String =
-        "${envDirectory()}/$directoryNameForAllAccounts/"
+        "$filesDir/$directoryNameForAllAccounts/"
 
     private fun directoryForAccount(accountId: KinAccount.Id): String {
         return directoryForAllAccounts() + accountId.hashCode() + "/"

build.gradle

@@ -237,7 +237,7 @@ allprojects {
     ext {
         // Libraries
         groupId = "org.kin.sdk.android"
-        libraryVersion = "1.0.1" // NOTE: ALSO CHANGE SDKConfig.versionString when updating. Should be identical.
+        libraryVersion = "2.0.0" // NOTE: ALSO CHANGE SDKConfig.versionString when updating. Should be identical.
         siteUrl = "https://github.com/kinecosystem/kin-android"
         gitUrl = "https://github.com/kinecosystem/kin-android.git"
     }