Fix encryption migration for rbs

Author: gthea

src/main/java/io/split/android/client/storage/cipher/ApplyCipherTask.java

@@ -79,14 +79,15 @@ private void updateRuleBasedSegment(RuleBasedSegmentDao ruleBasedSegmentDao) {
         }
 
         for (RuleBasedSegmentEntity item : items) {
-            String fromName = mFromCipher.decrypt(item.getName());
+            String name = item.getName();
+            String fromName = mFromCipher.decrypt(name);
             String fromBody = mFromCipher.decrypt(item.getBody());
 
             String toName = mToCipher.encrypt(fromName);
             String toBody = mToCipher.encrypt(fromBody);
 
             if (toName != null && toBody != null) {
-                ruleBasedSegmentDao.update(fromName, toName, toBody);
+                ruleBasedSegmentDao.update(name, toName, toBody);
             }
         }
     }

src/main/java/io/split/android/client/storage/splits/SqLitePersistentSplitsStorage.java

@@ -11,12 +11,15 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
-import io.split.android.client.SplitFactoryImpl;
 import io.split.android.client.dtos.Split;
 import io.split.android.client.dtos.Status;
 import io.split.android.client.service.executor.parallel.SplitParallelTaskExecutorFactory;
@@ -28,10 +31,6 @@
 import io.split.android.client.utils.Json;
 import io.split.android.client.utils.logger.Logger;
 
-import com.google.gson.reflect.TypeToken;
-import java.lang.reflect.Type;
-import java.util.concurrent.ConcurrentHashMap;
-
 public class SqLitePersistentSplitsStorage implements PersistentSplitsStorage {
 
     private static final int SQL_PARAM_BIND_SIZE = 20;