Added additional label to settings for current counter HOTP

coderbunker · Aug 9, 2018 · 09a0992 · 09a0992
1 parent 5034687
commit 09a0992
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git 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
@@ -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
@@ -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
@@ -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>