From e3f45039674bc82cdb89ae8a8189ea03f9af7217 Mon Sep 17 00:00:00 2001
From: Impyy <alex@impy.me>
Date: Wed, 3 May 2017 21:18:42 +0200
Subject: [PATCH] Move the OTP stuff to a separate folder

---
 app/src/main/java/me/impy/aegis/AddProfileActivity.java    | 3 +--
 app/src/main/java/me/impy/aegis/KeyProfileAdapter.java     | 2 +-
 app/src/main/java/me/impy/aegis/MainActivity.java          | 2 +-
 app/src/main/java/me/impy/aegis/crypto/{ => otp}/HOTP.java | 2 +-
 app/src/main/java/me/impy/aegis/crypto/{ => otp}/OTP.java  | 4 +++-
 app/src/main/java/me/impy/aegis/crypto/{ => otp}/TOTP.java | 2 +-
 app/src/test/java/me/impy/aegis/HOTPTest.java              | 2 +-
 app/src/test/java/me/impy/aegis/TOTPTest.java              | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)
 rename app/src/main/java/me/impy/aegis/crypto/{ => otp}/HOTP.java (99%)
 rename app/src/main/java/me/impy/aegis/crypto/{ => otp}/OTP.java (91%)
 rename app/src/main/java/me/impy/aegis/crypto/{ => otp}/TOTP.java (99%)

diff --git a/app/src/main/java/me/impy/aegis/AddProfileActivity.java b/app/src/main/java/me/impy/aegis/AddProfileActivity.java
index 40ca3105..e5c1ce28 100644
--- a/app/src/main/java/me/impy/aegis/AddProfileActivity.java
+++ b/app/src/main/java/me/impy/aegis/AddProfileActivity.java
@@ -9,11 +9,10 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.Window;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import me.impy.aegis.crypto.OTP;
+import me.impy.aegis.crypto.otp.OTP;
 
 public class AddProfileActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java b/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java
index b790fecf..e61ed3e5 100644
--- a/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java
+++ b/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import me.impy.aegis.crypto.OTP;
+import me.impy.aegis.crypto.otp.OTP;
 import me.impy.aegis.helpers.ItemTouchHelperAdapter;
 
 public class KeyProfileAdapter extends RecyclerView.Adapter<KeyProfileAdapter.KeyProfileHolder> implements ItemTouchHelperAdapter {
diff --git a/app/src/main/java/me/impy/aegis/MainActivity.java b/app/src/main/java/me/impy/aegis/MainActivity.java
index 028eb26f..8b87dd5f 100644
--- a/app/src/main/java/me/impy/aegis/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/MainActivity.java
@@ -43,7 +43,7 @@ import javax.crypto.SecretKey;
 import me.impy.aegis.crypto.CryptResult;
 import me.impy.aegis.crypto.CryptoUtils;
 import me.impy.aegis.crypto.MasterKey;
-import me.impy.aegis.crypto.OTP;
+import me.impy.aegis.crypto.otp.OTP;
 import me.impy.aegis.crypto.slots.PasswordSlot;
 import me.impy.aegis.crypto.slots.Slot;
 import me.impy.aegis.crypto.slots.SlotCollection;
diff --git a/app/src/main/java/me/impy/aegis/crypto/HOTP.java b/app/src/main/java/me/impy/aegis/crypto/otp/HOTP.java
similarity index 99%
rename from app/src/main/java/me/impy/aegis/crypto/HOTP.java
rename to app/src/main/java/me/impy/aegis/crypto/otp/HOTP.java
index f864adeb..227b2fa1 100644
--- a/app/src/main/java/me/impy/aegis/crypto/HOTP.java
+++ b/app/src/main/java/me/impy/aegis/crypto/otp/HOTP.java
@@ -1,4 +1,4 @@
-package me.impy.aegis.crypto;
+package me.impy.aegis.crypto.otp;
 
 /*
 * OneTimePasswordAlgorithm.java
diff --git a/app/src/main/java/me/impy/aegis/crypto/OTP.java b/app/src/main/java/me/impy/aegis/crypto/otp/OTP.java
similarity index 91%
rename from app/src/main/java/me/impy/aegis/crypto/OTP.java
rename to app/src/main/java/me/impy/aegis/crypto/otp/OTP.java
index a935b725..c165cfbe 100644
--- a/app/src/main/java/me/impy/aegis/crypto/OTP.java
+++ b/app/src/main/java/me/impy/aegis/crypto/otp/OTP.java
@@ -1,4 +1,6 @@
-package me.impy.aegis.crypto;
+package me.impy.aegis.crypto.otp;
+
+import me.impy.aegis.crypto.KeyInfo;
 
 public class OTP {
     private OTP() {
diff --git a/app/src/main/java/me/impy/aegis/crypto/TOTP.java b/app/src/main/java/me/impy/aegis/crypto/otp/TOTP.java
similarity index 99%
rename from app/src/main/java/me/impy/aegis/crypto/TOTP.java
rename to app/src/main/java/me/impy/aegis/crypto/otp/TOTP.java
index 6c5d4edd..cb1fafdb 100644
--- a/app/src/main/java/me/impy/aegis/crypto/TOTP.java
+++ b/app/src/main/java/me/impy/aegis/crypto/otp/TOTP.java
@@ -1,4 +1,4 @@
-package me.impy.aegis.crypto;
+package me.impy.aegis.crypto.otp;
 
 /**
  Copyright (c) 2011 IETF Trust and the persons identified as
diff --git a/app/src/test/java/me/impy/aegis/HOTPTest.java b/app/src/test/java/me/impy/aegis/HOTPTest.java
index 7679f624..51435c3a 100644
--- a/app/src/test/java/me/impy/aegis/HOTPTest.java
+++ b/app/src/test/java/me/impy/aegis/HOTPTest.java
@@ -2,7 +2,7 @@ package me.impy.aegis;
 
 import org.junit.Test;
 
-import me.impy.aegis.crypto.HOTP;
+import me.impy.aegis.crypto.otp.HOTP;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/me/impy/aegis/TOTPTest.java b/app/src/test/java/me/impy/aegis/TOTPTest.java
index ccc00f73..10def313 100644
--- a/app/src/test/java/me/impy/aegis/TOTPTest.java
+++ b/app/src/test/java/me/impy/aegis/TOTPTest.java
@@ -2,7 +2,7 @@ package me.impy.aegis;
 
 import org.junit.Test;
 
-import me.impy.aegis.crypto.TOTP;
+import me.impy.aegis.crypto.otp.TOTP;
 
 import static org.junit.Assert.*;