From b9455046f40ac3371b9b1bdd39cfd14068d49679 Mon Sep 17 00:00:00 2001
From: Julian Schmuckli <julian@schmuckli.net>
Date: Wed, 8 Aug 2018 10:42:09 +0800
Subject: [PATCH 1/3] Added back button for settings screen #21

---
 app/src/main/AndroidManifest.xml                |  4 +++-
 .../com/coderbunker/kioskapp/KioskActivity.java |  1 -
 .../coderbunker/kioskapp/SettingsActivity.java  | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e86234e..2abe272 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,9 @@
             android:screenOrientation="landscape">
 
         </activity>
-        <activity android:name=".KioskActivity">
+        <activity
+            android:name=".KioskActivity"
+            android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java b/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
index 684608b..eda4504 100644
--- a/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
+++ b/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
@@ -15,7 +15,6 @@
 import android.view.Window;
 import android.view.WindowManager;
 import android.webkit.SslErrorHandler;
-import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
diff --git a/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java b/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
index 35eebb5..6fc92ea 100644
--- a/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
+++ b/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
@@ -2,12 +2,14 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.KeyEvent;
+import android.view.MenuItem;
 import android.view.View;
 import android.webkit.URLUtil;
 import android.widget.Button;
@@ -40,6 +42,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
 
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+
         prefs = this.getSharedPreferences(
                 "com.coderbunker.kioskapp", Context.MODE_PRIVATE);
 
@@ -111,4 +115,17 @@ private void generateQRCode(String uri) {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                Intent intent = new Intent(SettingsActivity.this, MainActivity.class);
+                startActivity(intent);
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }

From 50346872f1a514d0f7ea03e4ddcc01d7c0e5053a Mon Sep 17 00:00:00 2001
From: Julian Schmuckli <julian@schmuckli.net>
Date: Thu, 9 Aug 2018 14:10:14 +0800
Subject: [PATCH 2/3] Added HOTP implementation #5

---
 .idea/caches/build_file_checksums.ser         | Bin 536 -> 536 bytes
 app/build.gradle                              |   1 +
 .../coderbunker/kioskapp/KioskActivity.java   |  20 +++-
 .../kioskapp/SettingsActivity.java            |  33 +++++-
 .../com/coderbunker/kioskapp/lib/HOTP.java    | 100 ++++++++++++++++++
 app/src/main/res/layout/activity_settings.xml |  67 +++++++++---
 build.gradle                                  |   2 +-
 7 files changed, 203 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/com/coderbunker/kioskapp/lib/HOTP.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 595be42bb13139df3cd233f4b8f5cb8b61bcb44a..6cb64b4e9844ebde380fa615da121b1e994a9036 100644
GIT binary patch
delta 53
zcmV-50LuTE1egSnm;@YZfya@Y;}9gOQ)ag!I~y>-Vgn{3B6X9G0eBIVs~%D>r;k!`
LF7Upta^z%qBJ&k|

delta 53
zcmV-50LuTE1egSnm;?;{07j9V;}9dule1<jTah`@Uo6rubZe830eBJk1r%sV5Q`ia
LDvkzVNx0m2I1d!3

diff --git a/app/build.gradle b/app/build.gradle
index 48983f6..fc7d618 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    implementation "com.google.guava:guava:16+"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java b/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
index eda4504..7ca2479 100644
--- a/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
+++ b/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
@@ -20,8 +20,11 @@
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.coderbunker.kioskapp.lib.HOTP;
 import com.coderbunker.kioskapp.lib.TOTP;
 
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -223,6 +226,7 @@ private void launchHome() {
 
     private void checkPwd() {
         String otp = prefs.getString("otp", null);
+        int hotp_counter = prefs.getInt("hotp_counter", 0);
         if (otp == null) {
             Toast.makeText(context, "Please go to the settings and create a password", Toast.LENGTH_SHORT).show();
             launchHome();
@@ -231,8 +235,22 @@ private void checkPwd() {
             String generated_number = TOTP.generateCurrentNumber(otp, System.currentTimeMillis());
             String previous_generated_number = TOTP.generateCurrentNumber(otp, System.currentTimeMillis() - 30000);
 
+
+            //HOTP
+            for (int i = 0; i < 10; i++) {
+                if (pwd.equals(HOTP.generateHOTP(hotp_counter - 5 + i, otp))) {
+                    Toast.makeText(context, "HOTP PIN correct", Toast.LENGTH_SHORT).show();
+
+                    hotp_counter++;
+                    prefs.edit().putInt("hotp_counter", hotp_counter).apply();
+
+                    launchHome();
+                }
+            }
+
+            //TOTP
             if (pwd.equals(generated_number) || pwd.equals(previous_generated_number)) {
-                Toast.makeText(context, "PIN correct", Toast.LENGTH_SHORT).show();
+                Toast.makeText(context, "TOTP PIN correct", Toast.LENGTH_SHORT).show();
                 launchHome();
             } else {
                 dialog.dismiss();
diff --git a/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java b/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
index 6fc92ea..3a27d1a 100644
--- a/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
+++ b/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
@@ -30,12 +30,12 @@ public class SettingsActivity extends Activity {
 
     private Context context = this;
     private EditText editURL;
-    private ImageView imgQRCode;
+    private ImageView imgQRCode, imgQRCodeHOTP;
     private Button btnSave;
 
     private SharedPreferences prefs;
 
-    private String otp_uri;
+    private String otp_uri, hotp_uri;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,6 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 "com.coderbunker.kioskapp", Context.MODE_PRIVATE);
 
         imgQRCode = findViewById(R.id.imgQRCode);
+        imgQRCodeHOTP = findViewById(R.id.imgQRCodeHOTP);
         editURL = findViewById(R.id.editText_URL);
         btnSave = findViewById(R.id.btnSave);
 
@@ -70,6 +71,7 @@ public void onClick(View v) {
 
         String otp = prefs.getString("otp", null);
         String url = prefs.getString("url", "https://naibaben.github.io/");
+        int hotp_counter = prefs.getInt("hotp_counter", 0);
 
         editURL.setText(url);
 
@@ -92,12 +94,14 @@ public void onClick(View v) {
             editor.apply();
         }
 
-        otp_uri = "otpauth://totp/Admin?secret=" + otp + "&issuer=Coderbunker";
+        otp_uri = "otpauth://totp/Time%20based?secret=" + otp + "&issuer=Kiosk%20Coderbunker";
+        hotp_uri = "otpauth://hotp/Hash%20based?secret=" + otp + "&issuer=Kiosk%20Coderbunker&counter=" + hotp_counter + "&algorithm=SHA1";
 
-        generateQRCode(otp_uri);
+        generateQRCodeTOTP(otp_uri);
+        generateQRCodeHOTP(hotp_uri);
     }
 
-    private void generateQRCode(String uri) {
+    private void generateQRCodeTOTP(String uri) {
         QRCodeWriter writer = new QRCodeWriter();
         try {
             BitMatrix bitMatrix = writer.encode(uri, BarcodeFormat.QR_CODE, 512, 512);
@@ -116,6 +120,25 @@ private void generateQRCode(String uri) {
         }
     }
 
+    private void generateQRCodeHOTP(String uri) {
+        QRCodeWriter writer = new QRCodeWriter();
+        try {
+            BitMatrix bitMatrix = writer.encode(uri, BarcodeFormat.QR_CODE, 512, 512);
+            int width = bitMatrix.getWidth();
+            int height = bitMatrix.getHeight();
+            Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
+            for (int x = 0; x < width; x++) {
+                for (int y = 0; y < height; y++) {
+                    bmp.setPixel(x, y, bitMatrix.get(x, y) ? Color.BLACK : Color.WHITE);
+                }
+            }
+            imgQRCodeHOTP.setImageBitmap(bmp);
+
+        } catch (WriterException e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
diff --git a/app/src/main/java/com/coderbunker/kioskapp/lib/HOTP.java b/app/src/main/java/com/coderbunker/kioskapp/lib/HOTP.java
new file mode 100644
index 0000000..1b5f768
--- /dev/null
+++ b/app/src/main/java/com/coderbunker/kioskapp/lib/HOTP.java
@@ -0,0 +1,100 @@
+   /*
+    * HOTP.java
+    * OATH Initiative,
+    * HOTP one-time password algorithm
+    *
+    */
+
+   /* Copyright (C) 2004, OATH.  All rights reserved.
+    *
+    * License to copy and use this software is granted provided that it
+    * is identified as the "OATH HOTP Algorithm" in all material
+    * mentioning or referencing this software or this function.
+    *
+    * License is also granted to make and use derivative works provided
+    * that such works are identified as
+    *  "derived from OATH HOTP algorithm"
+    * in all material mentioning or referencing the derived work.
+    *
+    * OATH (Open AuTHentication) and its members make no
+    * representations concerning either the merchantability of this
+    * software or the suitability of this software for any particular
+    * purpose.
+    *
+    * It is provided "as is" without express or implied warranty
+    * of any kind and OATH AND ITS MEMBERS EXPRESSaLY DISCLAIMS
+    * ANY WARRANTY OR LIABILITY OF ANY KIND relating to this software.
+    *
+    * These notices must be retained in any copies of any part of this
+    * documentation and/or software.
+    */
+
+   package com.coderbunker.kioskapp.lib;
+
+   import java.lang.reflect.UndeclaredThrowableException;
+   import java.security.GeneralSecurityException;
+
+   import javax.crypto.Mac;
+   import javax.crypto.spec.SecretKeySpec;
+
+   /**
+    * This class contains static methods that are used to calculate the
+    * One-Time Password (OTP) using
+    * JCE to provide the HMAC-SHA-1.
+    *
+    * @author Loren Hart
+    * @version 1.0
+    */
+   public class HOTP {
+       public static final int[] DIGITS_POWER
+               //  0  1   2     3    4        5        6       7         8
+               = {1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000};
+
+       public static String generateHOTP(long count, String seedString) {
+
+           byte[] counter = new byte[8];
+           long movingFactor = count;
+
+           for (int i = counter.length - 1; i >= 0; i--) {
+               counter[i] = (byte) (movingFactor & 0xff);
+               movingFactor >>= 8;
+           }
+           byte[] seed = new byte[0];
+           try {
+               seed = Base32.decode(seedString);
+           } catch (Base32.DecodingException e) {
+               e.printStackTrace();
+           }
+
+
+           byte[] hash = HMAC(seed, counter);
+           int offset = hash[hash.length - 1] & 0xf;
+
+           int otpBinary = ((hash[offset] & 0x7f) << 24)
+                   | ((hash[offset + 1] & 0xff) << 16)
+                   | ((hash[offset + 2] & 0xff) << 8)
+                   | (hash[offset + 3] & 0xff);
+
+           int otp = otpBinary % DIGITS_POWER[6];
+           String result = Integer.toString(otp);
+
+           while (result.length() < 6) {
+               result = "0" + result;
+           }
+           return result;
+
+       }
+
+       private static byte[] HMAC(byte[] seed, byte[] counter) {
+
+           try {
+               Mac hmac = Mac.getInstance("HmacSHA1");
+               SecretKeySpec macKey = new SecretKeySpec(seed, "RAW");
+               hmac.init(macKey);
+               return hmac.doFinal(counter);
+
+           } catch (GeneralSecurityException ex) {
+               throw new UndeclaredThrowableException(ex);
+           }
+       }
+   }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index becf23a..b846515 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -19,21 +19,62 @@
             android:orientation="vertical">
 
 
-            <TextView
-                android:id="@+id/textView_otp"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:paddingVertical="20dp"
-                android:text="TOTP"
-                android:textColor="@android:color/black"
-                android:textSize="22dp" />
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/imgQRCode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_launcher_background" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/textView_otp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center_horizontal"
+                        android:paddingVertical="20dp"
+                        android:text="Time based"
+                        android:textColor="@android:color/black"
+                        android:textSize="22dp" />
+
+                    <ImageView
+                        android:id="@+id/imgQRCode"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:src="@drawable/ic_launcher_background" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/textView_hotp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center_horizontal"
+                        android:paddingVertical="20dp"
+                        android:text="Counter based"
+                        android:textColor="@android:color/black"
+                        android:textSize="22dp" />
+
+                    <ImageView
+                        android:id="@+id/imgQRCodeHOTP"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:src="@drawable/ic_launcher_background" />
+                </LinearLayout>
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/textView_URL"
diff --git a/build.gradle b/build.gradle
index 43c0708..077cb2f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         
 
         // NOTE: Do not place your application dependencies here; they belong

From 09a0992e15e0e0183da027452301c0d264540140 Mon Sep 17 00:00:00 2001
From: Julian Schmuckli <julian@schmuckli.net>
Date: Thu, 9 Aug 2018 14:32:43 +0800
Subject: [PATCH 3/3] Added additional label to settings for current counter
 HOTP

---
 .idea/caches/build_file_checksums.ser          | Bin 536 -> 536 bytes
 app/build.gradle                               |   1 -
 .../coderbunker/kioskapp/KioskActivity.java    |   8 ++++++--
 .../coderbunker/kioskapp/SettingsActivity.java |   7 +++++--
 app/src/main/res/layout/activity_settings.xml  |  17 +++++++++++++++++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6cb64b4e9844ebde380fa615da121b1e994a9036..74f562175d3065126e0825f8155fd25b07ba8c16 100644
GIT binary patch
delta 33
pcmbQiGJ|Ep3>Mh{SE-G2vKa+`u!>}O2z1McYxS`uc<#7U0RXZ_3jF{8

delta 33
pcmbQiGJ|Ep3>KNJ#^W33WHSm*SuGc&zq~)FQ18RObwy87Dgfae4v+u<

diff --git a/app/build.gradle b/app/build.gradle
index fc7d618..48983f6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
-    implementation "com.google.guava:guava:16+"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java b/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
index 7ca2479..fce8873 100644
--- a/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
+++ b/app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
@@ -87,11 +87,16 @@ protected void onCreate(Bundle savedInstanceState) {
         webView = findViewById(R.id.webview);
         webView.setWebViewClient(new WebViewClient() {
             @Override
-            public void onPageFinished(WebView view, String url) {
+            public void onPageFinished(final WebView view, String url) {
                 super.onPageFinished(view, url);
                 TimerTask lock = new TimerTask() {
                     @Override
                     public void run() {
+                        runOnUiThread(new Runnable() {
+                            public void run() {
+                                Toast.makeText(context, "Kioskmode locked", Toast.LENGTH_SHORT).show();
+                            }
+                        });
                         locked = true;
                     }
                 };
@@ -136,7 +141,6 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
         });
 
         numbers = new ArrayList<Button>();
-
     }
 
 
diff --git a/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java b/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
index 3a27d1a..f0676da 100644
--- a/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
+++ b/app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
@@ -31,6 +31,7 @@ public class SettingsActivity extends Activity {
     private Context context = this;
     private EditText editURL;
     private ImageView imgQRCode, imgQRCodeHOTP;
+    private TextView lblCurrentHOTPCycle;
     private Button btnSave;
 
     private SharedPreferences prefs;
@@ -51,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
         imgQRCodeHOTP = findViewById(R.id.imgQRCodeHOTP);
         editURL = findViewById(R.id.editText_URL);
         btnSave = findViewById(R.id.btnSave);
-
+        lblCurrentHOTPCycle = findViewById(R.id.current_hotp_cycle);
 
         btnSave.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -75,6 +76,8 @@ public void onClick(View v) {
 
         editURL.setText(url);
 
+        lblCurrentHOTPCycle.setText("Current counter cycle: " + hotp_counter);
+
         if (otp == null) {
 
             byte key_1 = (byte) Math.floor(Math.random() * 10);
@@ -95,7 +98,7 @@ public void onClick(View v) {
         }
 
         otp_uri = "otpauth://totp/Time%20based?secret=" + otp + "&issuer=Kiosk%20Coderbunker";
-        hotp_uri = "otpauth://hotp/Hash%20based?secret=" + otp + "&issuer=Kiosk%20Coderbunker&counter=" + hotp_counter + "&algorithm=SHA1";
+        hotp_uri = "otpauth://hotp/Hash%20based?secret=" + otp + "&issuer=Kiosk%20Coderbunker&counter=" + (hotp_counter - 1) + "&algorithm=SHA1";
 
         generateQRCodeTOTP(otp_uri);
         generateQRCodeHOTP(hotp_uri);
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index b846515..3bf6f38 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -47,6 +47,14 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:src="@drawable/ic_launcher_background" />
+
+                    <TextView
+                        android:id="@+id/placeholder"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textAlignment="center" />
+
                 </LinearLayout>
 
                 <LinearLayout
@@ -72,6 +80,15 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:src="@drawable/ic_launcher_background" />
+
+                    <TextView
+                        android:id="@+id/current_hotp_cycle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="Current cycle: ---"
+                        android:textAlignment="center" />
+
                 </LinearLayout>
 
             </LinearLayout>