Dp 492 one wallet account linking api

.travis.yml

@@ -5,8 +5,8 @@ services:
   - docker
 
 before_install:
-- yes | sdkmanager "platforms;android-26"
-- yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "platforms;android-26"
+  - yes | sdkmanager "platforms;android-28"
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -23,10 +23,10 @@ cache:
     - node_modules
 
 env:
-- TEST_MATRIX=assemble
-- TEST_MATRIX=units
-- TEST_MATRIX=android_test_kin_sdk
-- TEST_MATRIX=android_test_backup_restore
+  - TEST_MATRIX=assemble
+  - TEST_MATRIX=units
+  - TEST_MATRIX=android_test_kin_sdk
+  - TEST_MATRIX=android_test_backup_restore
 
 android:
   components:

kin-backup-and-restore/kin-backup-and-restore-lib/src/androidTest/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kin.backupandrestore.test">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>

kin-backup-and-restore/kin-backup-and-restore-lib/src/androidTest/java/kin/backupandrestore/qr/QRBarcodeGeneratorImplTest.java

@@ -17,91 +17,91 @@
 
 public class QRBarcodeGeneratorImplTest {
 
-	private static final String TEST_DATA = "{\n"
-		+ "  \"pkey\": \"GCJS54LFY5H5UXSAKLWP3GXCNKAZZLRAPO45B6PLAAINRVKJSWZGZAF4\",\n"
-		+ "  \"seed\": \"cb60a6afa2427194f4fbdc19969dd2b34677e2cae5108d34f51970a43f47eacf36520ebe26c34064ab6d1cd29e9e8c362685651a81f0ce0525dd728028b7956e037545ec223b72d8\",\n"
-		+ "  \"salt\": \"f16fa85a112efdd00eb0134239f53c37\"\n"
-		+ "}";
-
-	private static final String EXPECTED_TEXT_QR_IMAGE = "{\n"
-		+ "  \"pkey\": \"GCJS54LFY5H5UXSAKLWP3GXCNKAZZLRAPO45B6PLAAINRVKJSWZGZAF4\",\n"
-		+ "  \"seed\": \"c71d8965df716fb0a6edb53b5f4215f9f5b29552aef761e44b0d3fd9a26eb8fae3001e5be27e1d0df1f3baf72b2ddea38075cd0783d14e842c555d1b7264211546503fab7b647b09\",\n"
-		+ "  \"salt\": \"ad1b920b16e4f7b519ac5117af77069d\"\n"
-		+ "}";
-
-	private static final String EXPECTED_TEXT_QR_IMAGE_TRY_HARDER = "{\n"
-		+ "  \"pkey\": \"GCSFMCRAJ7UQU7MDA5TUBY3ROFYU6L6D2JPKXUM4YGSL2SLZOTKCS647\",\n"
-		+ "  \"seed\": \"6f9e2fe953d37a0122347df582e57f9f7a2a7a91eccb3c5b13450c4ac7b94987ebd330e546b020e930062ed01c32d228f557e74979d3170d66644a6407ba56f70d9d508e2f4c5b7a\",\n"
-		+ "  \"salt\": \"0586cdddfa57a2cfa8d02ca78103f3c7\"\n"
-		+ "}";
-
-	@Rule
-	public ExpectedException expectedEx = ExpectedException.none();
-	private QRBarcodeGeneratorImpl qrBarcodeGenerator;
-
-	private FakeQRFileUriHandler fakeQRFileHandler;
-
-	class FakeQRFileUriHandler implements QRFileUriHandler {
-
-		private int counter = 0;
-		private HashMap<Uri, Bitmap> map = new HashMap<>();
-
-		@NonNull
-		@Override
-		public Bitmap loadFile(@NonNull Uri uri) {
-			return map.get(uri);
-		}
-
-		@NonNull
-		@Override
-		public Uri saveFile(@NonNull Bitmap image) {
-			Uri fakeUri = Uri.parse("file://test/" + counter + ".png");
-			map.put(fakeUri, image);
-			return fakeUri;
-		}
-	}
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		fakeQRFileHandler = new FakeQRFileUriHandler();
-		qrBarcodeGenerator = new QRBarcodeGeneratorImpl(fakeQRFileHandler);
-	}
-
-	@Test
-	public void generate_success() throws Exception {
-		Uri uri = qrBarcodeGenerator.generate(TEST_DATA);
-		assertNotNull(uri);
-		assertNotNull(fakeQRFileHandler.loadFile(uri));
-	}
-
-	@Test
-	public void decodeQR_success() throws Exception {
-		// test a QR that was being able to be decoded only with TRY_HARDER flag in zxing library
-		Bitmap bitmap = TestUtils.loadBitmapFromResource(this.getClass(), "backup_qr_try_harder.png");
-		Uri uri = fakeQRFileHandler.saveFile(bitmap);
-		String decodedQR = qrBarcodeGenerator.decodeQR(uri);
-		assertThat(decodedQR, equalTo(EXPECTED_TEXT_QR_IMAGE_TRY_HARDER));
-
-		Bitmap bitmap2 = TestUtils.loadBitmapFromResource(this.getClass(), "qr_test.png");
-		Uri uri2 = fakeQRFileHandler.saveFile(bitmap2);
-		String decodedQR2 = qrBarcodeGenerator.decodeQR(uri2);
-		assertThat(decodedQR2, equalTo(EXPECTED_TEXT_QR_IMAGE));
-	}
-
-	@Test
-	public void decodeQR_EmptyImage_NotFoundException() throws Exception {
-		expectedEx.expect(QRNotFoundInImageException.class);
-		Bitmap bitmap = Bitmap.createBitmap(300, 300, Bitmap.Config.ARGB_8888);
-		Uri uri = fakeQRFileHandler.saveFile(bitmap);
-		qrBarcodeGenerator.decodeQR(uri);
-	}
-
-	@Test
-	public void generateAndDecode_success() throws Exception {
-		Uri uri = qrBarcodeGenerator.generate(TEST_DATA);
-		String decodedQR = qrBarcodeGenerator.decodeQR(uri);
-		assertThat(decodedQR, equalTo(TEST_DATA));
-	}
+    private static final String TEST_DATA = "{\n"
+        + "  \"pkey\": \"GCJS54LFY5H5UXSAKLWP3GXCNKAZZLRAPO45B6PLAAINRVKJSWZGZAF4\",\n"
+        + "  \"seed\": \"cb60a6afa2427194f4fbdc19969dd2b34677e2cae5108d34f51970a43f47eacf36520ebe26c34064ab6d1cd29e9e8c362685651a81f0ce0525dd728028b7956e037545ec223b72d8\",\n"
+        + "  \"salt\": \"f16fa85a112efdd00eb0134239f53c37\"\n"
+        + "}";
+
+    private static final String EXPECTED_TEXT_QR_IMAGE = "{\n"
+        + "  \"pkey\": \"GCJS54LFY5H5UXSAKLWP3GXCNKAZZLRAPO45B6PLAAINRVKJSWZGZAF4\",\n"
+        + "  \"seed\": \"c71d8965df716fb0a6edb53b5f4215f9f5b29552aef761e44b0d3fd9a26eb8fae3001e5be27e1d0df1f3baf72b2ddea38075cd0783d14e842c555d1b7264211546503fab7b647b09\",\n"
+        + "  \"salt\": \"ad1b920b16e4f7b519ac5117af77069d\"\n"
+        + "}";
+
+    private static final String EXPECTED_TEXT_QR_IMAGE_TRY_HARDER = "{\n"
+        + "  \"pkey\": \"GCSFMCRAJ7UQU7MDA5TUBY3ROFYU6L6D2JPKXUM4YGSL2SLZOTKCS647\",\n"
+        + "  \"seed\": \"6f9e2fe953d37a0122347df582e57f9f7a2a7a91eccb3c5b13450c4ac7b94987ebd330e546b020e930062ed01c32d228f557e74979d3170d66644a6407ba56f70d9d508e2f4c5b7a\",\n"
+        + "  \"salt\": \"0586cdddfa57a2cfa8d02ca78103f3c7\"\n"
+        + "}";
+
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+    private QRBarcodeGeneratorImpl qrBarcodeGenerator;
+
+    private FakeQRFileUriHandler fakeQRFileHandler;
+
+    class FakeQRFileUriHandler implements QRFileUriHandler {
+
+        private int counter = 0;
+        private HashMap<Uri, Bitmap> map = new HashMap<>();
+
+        @NonNull
+        @Override
+        public Bitmap loadFile(@NonNull Uri uri) {
+            return map.get(uri);
+        }
+
+        @NonNull
+        @Override
+        public Uri saveFile(@NonNull Bitmap image) {
+            Uri fakeUri = Uri.parse("file://test/" + counter + ".png");
+            map.put(fakeUri, image);
+            return fakeUri;
+        }
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        fakeQRFileHandler = new FakeQRFileUriHandler();
+        qrBarcodeGenerator = new QRBarcodeGeneratorImpl(fakeQRFileHandler);
+    }
+
+    @Test
+    public void generate_success() throws Exception {
+        Uri uri = qrBarcodeGenerator.generate(TEST_DATA);
+        assertNotNull(uri);
+        assertNotNull(fakeQRFileHandler.loadFile(uri));
+    }
+
+    @Test
+    public void decodeQR_success() throws Exception {
+        // test a QR that was being able to be decoded only with TRY_HARDER flag in zxing library
+        Bitmap bitmap = TestUtils.loadBitmapFromResource(this.getClass(), "backup_qr_try_harder.png");
+        Uri uri = fakeQRFileHandler.saveFile(bitmap);
+        String decodedQR = qrBarcodeGenerator.decodeQR(uri);
+        assertThat(decodedQR, equalTo(EXPECTED_TEXT_QR_IMAGE_TRY_HARDER));
+
+        Bitmap bitmap2 = TestUtils.loadBitmapFromResource(this.getClass(), "qr_test.png");
+        Uri uri2 = fakeQRFileHandler.saveFile(bitmap2);
+        String decodedQR2 = qrBarcodeGenerator.decodeQR(uri2);
+        assertThat(decodedQR2, equalTo(EXPECTED_TEXT_QR_IMAGE));
+    }
+
+    @Test
+    public void decodeQR_EmptyImage_NotFoundException() throws Exception {
+        expectedEx.expect(QRNotFoundInImageException.class);
+        Bitmap bitmap = Bitmap.createBitmap(300, 300, Bitmap.Config.ARGB_8888);
+        Uri uri = fakeQRFileHandler.saveFile(bitmap);
+        qrBarcodeGenerator.decodeQR(uri);
+    }
+
+    @Test
+    public void generateAndDecode_success() throws Exception {
+        Uri uri = qrBarcodeGenerator.generate(TEST_DATA);
+        String decodedQR = qrBarcodeGenerator.decodeQR(uri);
+        assertThat(decodedQR, equalTo(TEST_DATA));
+    }
 
 }

kin-backup-and-restore/kin-backup-and-restore-lib/src/androidTest/java/kin/backupandrestore/qr/QRFileUriHandlerImplTest.java

@@ -12,27 +12,28 @@
 
 public class QRFileUriHandlerImplTest {
 
-	private QRFileUriHandlerImpl fileUriHandler;
-
-	@Before
-	public void setup() {
-		fileUriHandler = new QRFileUriHandlerImpl(InstrumentationRegistry.getContext());
-	}
-
-	@Test
-	public void saveAndLoad() throws Exception {
-		Bitmap bitmap = TestUtils.loadBitmapFromResource(this.getClass(), "qr_test.png");
-		Uri uri = fileUriHandler.saveFile(bitmap);
-		Bitmap loadedBitmap = fileUriHandler.loadFile(uri);
-		assertThat(bitmap.sameAs(loadedBitmap), equalTo(true));
-	}
-
-	@Test
-	public void saveFile_Success() throws Exception {
-		Bitmap bitmap = TestUtils.loadBitmapFromResource(this.getClass(), "qr_test.png");
-		Uri uri = fileUriHandler.saveFile(bitmap);
-		assertThat(uri, notNullValue());
-		assertThat(uri.toString(), equalTo("content://kin.backupandrestore.test.KinRecoveryFileProvider/qr_codes/backup_qr.png"));
-	}
+    private QRFileUriHandlerImpl fileUriHandler;
+
+    @Before
+    public void setup() {
+        fileUriHandler = new QRFileUriHandlerImpl(InstrumentationRegistry.getContext());
+    }
+
+    @Test
+    public void saveAndLoad() throws Exception {
+        Bitmap bitmap = TestUtils.loadBitmapFromResource(this.getClass(), "qr_test.png");
+        Uri uri = fileUriHandler.saveFile(bitmap);
+        Bitmap loadedBitmap = fileUriHandler.loadFile(uri);
+        assertThat(bitmap.sameAs(loadedBitmap), equalTo(true));
+    }
+
+    @Test
+    public void saveFile_Success() throws Exception {
+        Bitmap bitmap = TestUtils.loadBitmapFromResource(this.getClass(), "qr_test.png");
+        Uri uri = fileUriHandler.saveFile(bitmap);
+        assertThat(uri, notNullValue());
+        assertThat(uri.toString(),
+            equalTo("content://kin.backupandrestore.test.KinRecoveryFileProvider/qr_codes/backup_qr.png"));
+    }
 
 }

kin-backup-and-restore/kin-backup-and-restore-lib/src/androidTest/java/kin/backupandrestore/qr/TestUtils.java

@@ -7,8 +7,8 @@
 
 public class TestUtils {
 
-	static Bitmap loadBitmapFromResource(Class clazz, String res) {
-		InputStream is = clazz.getClassLoader().getResourceAsStream(res);
-		return BitmapFactory.decodeStream(is);
-	}
+    static Bitmap loadBitmapFromResource(Class clazz, String res) {
+        InputStream is = clazz.getClassLoader().getResourceAsStream(res);
+        return BitmapFactory.decodeStream(is);
+    }
 }

kin-backup-and-restore/kin-backup-and-restore-lib/src/main/java/kin/backupandrestore/AccountExtractor.java

@@ -7,19 +7,19 @@
 
 public class AccountExtractor {
 
-	@Nullable
-	public static KinAccount getKinAccount(KinClient kinClient, String publicAddress) {
-		KinAccount kinAccount = null;
-		if (kinClient != null && !TextUtils.isEmpty(publicAddress)) {
-			int numOfAccounts = kinClient.getAccountCount();
-			for (int i = 0; i < numOfAccounts; i++) {
-				KinAccount account = kinClient.getAccount(i);
-				if (account != null && account.getPublicAddress().equals(publicAddress)) {
-					kinAccount = account;
-					break;
-				}
-			}
-		}
-		return kinAccount;
-	}
+    @Nullable
+    public static KinAccount getKinAccount(KinClient kinClient, String publicAddress) {
+        KinAccount kinAccount = null;
+        if (kinClient != null && !TextUtils.isEmpty(publicAddress)) {
+            int numOfAccounts = kinClient.getAccountCount();
+            for (int i = 0; i < numOfAccounts; i++) {
+                KinAccount account = kinClient.getAccount(i);
+                if (account != null && account.getPublicAddress().equals(publicAddress)) {
+                    kinAccount = account;
+                    break;
+                }
+            }
+        }
+        return kinAccount;
+    }
 }