Merge pull request #53 from kinecosystem/update_migration_module_version_to_1.0.2

Update migration module version

Author: drEfrati

kin-devplatform-sdk/build.gradle

@@ -19,7 +19,7 @@ android {
 dependencies {
 
     implementation project(':kin-devplatform-core')
-    implementation 'com.github.kinecosystem:kin-migration-module-android:1.0.1'
+    implementation 'com.github.kinecosystem:kin-migration-module-android:1.0.2'
     implementation 'com.github.kinecosystem.kin-ecosystem-android-sdk:recovery:d73ef56'
     api 'com.github.kinecosystem:kin-utils-android:1.1'
     implementation devDependencies.appCompat_v7

kin-devplatform-sdk/src/main/java/kin/devplatform/ConfigurationLocal.java

@@ -16,6 +16,7 @@ public class ConfigurationLocal implements Configuration.Local {
 	private static final String NEW_BLOCKCHAIN_NETWORK_URL_KEY = "new_blockchain_network_url";
 	private static final String NEW_BLOCKCHAIN_PASSPHRASE_KEY = "new_blockchain_passphrase";
 	private static final String OLD_BLOCKCHAIN_ISSUER_KEY = "old_blockchain_issuer";
+	private static final String MIGRATION_SERVICE_URL_KEY = "migration_service_url";
 	private static final String ECOSYSTEM_SERVER_URL_KEY = "ecosystem_server_url";
 	private static final String ECOSYSTEM_WEB_FRONT_URL_KEY = "ecosystem_web_front_url";
 	private static final String BI_URL_KEY = "bi_url";
@@ -47,6 +48,7 @@ public KinEnvironment getEnvironment() {
 		final String newBlockchainNetworkUrl = configurationSharedPreferences.getString(NEW_BLOCKCHAIN_NETWORK_URL_KEY, null);
 		final String newBlockchainPassphrase = configurationSharedPreferences.getString(NEW_BLOCKCHAIN_PASSPHRASE_KEY, null);
 		final String issuer = configurationSharedPreferences.getString(OLD_BLOCKCHAIN_ISSUER_KEY, null);
+		final String migrationServiceUrl = configurationSharedPreferences.getString(MIGRATION_SERVICE_URL_KEY, null);
 		final String ecosystemServerUrl = configurationSharedPreferences.getString(ECOSYSTEM_SERVER_URL_KEY, null);
 		final String ecosystemWebFrontUrl = configurationSharedPreferences.getString(ECOSYSTEM_WEB_FRONT_URL_KEY, null);
 		final String biUrl = configurationSharedPreferences.getString(BI_URL_KEY, null);
@@ -55,7 +57,7 @@ public KinEnvironment getEnvironment() {
 			return null;
 		} else {
 			return new Environment(oldBlockchainNetworkUrl, oldBlockchainPassphrase, newBlockchainNetworkUrl, newBlockchainPassphrase,
-					issuer, ecosystemServerUrl, ecosystemWebFrontUrl, biUrl);
+				issuer, migrationServiceUrl, ecosystemServerUrl, ecosystemWebFrontUrl, biUrl);
 		}
 
 	}
@@ -68,6 +70,7 @@ public void setEnvironment(@NonNull KinEnvironment kinEnvironment) {
 		editor.putString(NEW_BLOCKCHAIN_NETWORK_URL_KEY, kinEnvironment.getNewBlockchainNetworkUrl());
 		editor.putString(NEW_BLOCKCHAIN_PASSPHRASE_KEY, kinEnvironment.getNewBlockchainPassphrase());
 		editor.putString(OLD_BLOCKCHAIN_ISSUER_KEY, kinEnvironment.getOldBlockchainIssuer());
+		editor.putString(MIGRATION_SERVICE_URL_KEY, kinEnvironment.getMigrationServiceUrl());
 		editor.putString(ECOSYSTEM_SERVER_URL_KEY, kinEnvironment.getEcosystemServerUrl());
 		editor.putString(ECOSYSTEM_WEB_FRONT_URL_KEY, kinEnvironment.getEcosystemWebFront());
 		editor.putString(BI_URL_KEY, kinEnvironment.getBiUrl());

kin-devplatform-sdk/src/main/java/kin/devplatform/Environment.java

@@ -10,18 +10,21 @@ public class Environment implements KinEnvironment {
 	private final String oldBlockchainPassphrase;
 	private final String newBlockchainPassphrase;
 	private final String issuer;
+	private final String migrationServiceUrl;
 	private final String ecosystemServerUrl;
 	private final String ecosystemWebFront;
 	private final String biUrl;
 
 	public Environment(String oldBlockchainNetworkUrl, String oldBlockchainPassphrase, String newBlockchainNetworkUrl,
-		String newBlockchainPassphrase, String oldBlockchainIssuer, String ecosystemServerUrl, String ecosystemWebFront,
+		String newBlockchainPassphrase, String oldBlockchainIssuer, String migrationServiceUrl,
+		String ecosystemServerUrl, String ecosystemWebFront,
 		String biUrl) {
 		this.oldBlockchainNetworkUrl = oldBlockchainNetworkUrl;
 		this.newBlockchainNetworkUrl = newBlockchainNetworkUrl;
 		this.oldBlockchainPassphrase = oldBlockchainPassphrase;
 		this.newBlockchainPassphrase = newBlockchainPassphrase;
 		this.issuer = oldBlockchainIssuer;
+		this.migrationServiceUrl = migrationServiceUrl;
 		this.ecosystemServerUrl = ecosystemServerUrl;
 		this.ecosystemWebFront = ecosystemWebFront;
 		this.biUrl = biUrl;
@@ -52,6 +55,11 @@ public String getOldBlockchainIssuer() {
 		return issuer;
 	}
 
+	@Override
+	public String getMigrationServiceUrl() {
+		return migrationServiceUrl;
+	}
+
 	@Override
 	public String getEcosystemServerUrl() {
 		return ecosystemServerUrl;
@@ -75,6 +83,7 @@ public static KinEnvironment getPlayground() {
 				"http://horizon-testnet.kininfrastructure.com",
 				"Kin Testnet ; December 2018",
 				"GBC3SG6NGTSZ2OMH3FFGB7UVRQWILW367U4GSOOF4TFSZONV42UJXUH7",
+				"https://migration-devplatform-playground.developers.kinecosystem.com/migrate?address=",
 				"https://api.developers.kinecosystem.com/v1",
 				"https://s3.amazonaws.com/assets.developers.kinecosystem.com/web-offers/cards-based/index.html",
 				"https://kin-bi.appspot.com/devp_play_");
@@ -90,6 +99,7 @@ public static KinEnvironment getProduction() {
 				"https://horizon.kinfederation.com",
 				"Kin Mainnet ; December 2018",
 				"GDF42M3IPERQCBLWFEZKQRK77JQ65SCKTU3CW36HZVCX7XX5A5QXZIVK",
+				"https://migration-devplatform-production.developers.kinecosystem.com/migrate?address=",
 				"https://api-prod.developers.kinecosystem.com/v1",
 				"https://s3.amazonaws.com/assets.developers.kinecosystem.com/web-offers/cards-based/index.html",
 				"https://kin-bi.appspot.com/devp_");

kin-devplatform-sdk/src/main/java/kin/devplatform/KinEcosystemInitiator.java

@@ -163,13 +163,14 @@ private MigrationManager getMigrationManager(Context context, String appId) {
 		final String newNetworkUrl = kinEnvironment.getNewBlockchainNetworkUrl();
 		final String newNetworkId = kinEnvironment.getNewBlockchainPassphrase();
 		final String issuer = kinEnvironment.getOldBlockchainIssuer();
+		final String migrationServiceUrl = kinEnvironment.getMigrationServiceUrl();
 
 		if (appId == null) {
 			appId = BlockchainSourceLocal.getInstance(context).getAppId();
 		}
 
 		MigrationNetworkInfo migrationNetworkInfo = new MigrationNetworkInfo(oldNetworkUrl, oldNetworkId,
-			newNetworkUrl, newNetworkId, issuer);
+			newNetworkUrl, newNetworkId, issuer, migrationServiceUrl);
 
 		MigrationManager migrationManager = new MigrationManager(context, appId, migrationNetworkInfo,
 			new KinVersionProvider(appId),

kin-devplatform-sdk/src/main/java/kin/devplatform/KinEnvironment.java

@@ -12,6 +12,8 @@ public interface KinEnvironment {
 
 	String getOldBlockchainIssuer();
 
+	String getMigrationServiceUrl();
+
 	String getEcosystemServerUrl();
 
 	String getEcosystemWebFront();