Skip to content
This repository was archived by the owner on Sep 13, 2024. It is now read-only.

Implemented secret touch to open PIN dialog #24

Merged
merged 4 commits into from
Aug 10, 2018
Merged

Implemented secret touch to open PIN dialog #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f14e1ab
Implemented directly forward to settings if app not configured
julianschmuckli Aug 9, 2018
ff1315e
Small design improvements and added secret touch #14
julianschmuckli Aug 9, 2018
3229a55
Small fixes
julianschmuckli Aug 9, 2018
6fec81e
Fixed secret touch
julianschmuckli Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .idea/caches/build_file_checksums.ser
View file
Open in desktop
Binary file not shown.
63 changes: 51 additions & 12 deletions app/src/main/java/com/coderbunker/kioskapp/KioskActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
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;
Expand All @@ -50,7 +48,7 @@ public class KioskActivity extends Activity {
private Button n0, n1, n2, n3, n4, n5, n6, n7, n8, n9;
private ArrayList<Button> numbers;

private int cptPwd;
private int cptPwd, clicks = 0;

private Timer timerLock, timerNav;

Expand Down Expand Up @@ -82,6 +80,14 @@ protected void onCreate(Bundle savedInstanceState) {
"com.coderbunker.kioskapp", Context.MODE_PRIVATE);

URL = prefs.getString("url", "https://naibaben.github.io/");
String otp = prefs.getString("otp", null);

if (otp == null) {
Intent intent = new Intent(KioskActivity.this, SettingsActivity.class);
Toast.makeText(context, "Please setup first the One-Time-Passwords on your phone before you use the kiosk mode.", Toast.LENGTH_LONG).show();
startActivity(intent);
finish();
}

//Get the webView and load the URL
webView = findViewById(R.id.webview);
Expand Down Expand Up @@ -124,23 +130,60 @@ public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError e

Toast.makeText(this, "Loading " + URL, Toast.LENGTH_SHORT).show();

//Touch events for password
webView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
hideSystemUI();

System.out.println("Touch" + clicks);

if (!dialogPrompted && locked) {
new Timer().schedule(new TimerTask() {
@Override
public void run() {
clicks = 0;
}
}, 500);
clicks++;
System.out.println(clicks);
if (clicks >= 4) {
askPassword();
clicks = 0;
}
} else {

}
}
});
webView.setOnTouchListener(new View.OnTouchListener() {

@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
hideSystemUI();

System.out.println("Touch" + clicks);

if (!dialogPrompted && locked) {
askPassword();
new Timer().schedule(new TimerTask() {
@Override
public void run() {
clicks = 0;
}
}, 500);
clicks++;
System.out.println(clicks);
if (clicks >= 4) {
askPassword();
clicks = 0;
}
return true;
} else
return false;


}
});

numbers = new ArrayList<Button>();
numbers = new ArrayList<>();
}


Expand Down Expand Up @@ -185,11 +228,6 @@ public void onWindowFocusChanged(boolean hasFocus) {
}
}


public static void setURL(String newURL) {
URL = newURL;
}

public void enterNumber(String number) {

switch (cptPwd) {
Expand Down Expand Up @@ -249,6 +287,7 @@ private void checkPwd() {
prefs.edit().putInt("hotp_counter", hotp_counter).apply();

launchHome();
return;
}
}

Expand Down
15 changes: 11 additions & 4 deletions app/src/main/java/com/coderbunker/kioskapp/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
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;
Expand All @@ -24,6 +22,8 @@
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;

import java.util.UUID;

import static android.widget.Toast.LENGTH_LONG;

public class SettingsActivity extends Activity {
Expand Down Expand Up @@ -97,8 +97,15 @@ public void onClick(View v) {
editor.apply();
}

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 - 1) + "&algorithm=SHA1";
String device = prefs.getString("uuid", null);

if (device == null) {
device = UUID.randomUUID().toString();
prefs.edit().putString("uuid", device).apply();
}

otp_uri = "otpauth://totp/" + device + "%20-%20Time?secret=" + otp + "&issuer=Kiosk%20Coderbunker";
hotp_uri = "otpauth://hotp/" + device + "%20-%20Counter?secret=" + otp + "&issuer=Kiosk%20Coderbunker&counter=" + (hotp_counter - 1) + "&algorithm=SHA1";

generateQRCodeTOTP(otp_uri);
generateQRCodeHOTP(hotp_uri);
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/res/layout/activity_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFF"
android:orientation="vertical"
tools:context=".SettingsActivity">

Expand Down Expand Up @@ -108,13 +109,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Enter the URL here..."
android:inputType="textUri" />
android:inputType="textUri"
android:textColor="#000" />

<Button
android:id="@+id/btnSave"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Save" />
android:background="#FFF"
android:elevation="4dp"
android:text="Save"
android:textColor="#000" />


</LinearLayout>
Expand Down
94 changes: 77 additions & 17 deletions app/src/main/res/layout/password_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_height="fill_parent"
android:background="#FFF">

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_root"
Expand All @@ -22,42 +23,60 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false" />
android:background="#FFF"
android:clickable="false"
android:textColor="#000"
android:textSize="30sp" />

<Button
android:id="@+id/b2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false" />
android:background="#FFF"
android:clickable="false"
android:textColor="#000"
android:textSize="30sp" />

<Button
android:id="@+id/b3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false" />
android:background="#FFF"
android:clickable="false"
android:textColor="#000"
android:textSize="30sp" />

<Button
android:id="@+id/b4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false" />
android:background="#FFF"
android:clickable="false"
android:textColor="#000"
android:textSize="30sp" />

<Button
android:id="@+id/b5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false" />
android:background="#FFF"
android:clickable="false"
android:textColor="#000"
android:textSize="30sp" />

<Button
android:id="@+id/b6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false" />
android:background="#FFF"
android:clickable="false"
android:textColor="#000"
android:textSize="30sp" />

</LinearLayout>

Expand Down Expand Up @@ -88,67 +107,108 @@
<Button
android:id="@+id/number1"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:tag="1"
android:text="1" />
android:text="1"
android:textColor="#000" />

<Button
android:id="@+id/number2"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:tag="2"
android:text="2" />
android:text="2"
android:textColor="#000" />

<Button
android:id="@+id/number3"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:tag="3"
android:text="3" />
android:text="3"
android:textColor="#000" />

<Button
android:id="@+id/number4"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:tag="4"
android:text="4" />
android:text="4"
android:textColor="#000" />

<Button
android:id="@+id/number5"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:tag="5"
android:text="5" />
android:text="5"
android:textColor="#000" />

<Button
android:id="@+id/number6"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:tag="6"
android:text="6" />
android:text="6"
android:textColor="#000" />

<Button
android:id="@+id/number7"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:onClick=""
android:tag="7"
android:text="7" />
android:text="7"
android:textColor="#000" />

<Button
android:id="@+id/number8"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:onClick=""
android:tag="8"
android:text="8" />
android:text="8"
android:textColor="#000" />

<Button
android:id="@+id/number9"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:onClick=""
android:tag="9"
android:text="9" />
android:text="9"
android:textColor="#000" />

<Button
android:id="@+id/number0"
android:layout_column="1"
android:layout_columnWeight="1"
android:layout_margin="3dp"
android:background="#FFF"
android:elevation="4dp"
android:onClick=""
android:tag="0"
android:text="0" />
android:text="0"
android:textColor="#000" />

</GridLayout>

</RelativeLayout>