diff --git a/.gradle/4.4/fileChanges/last-build.bin b/.gradle/4.4/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/4.4/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/4.4/fileContent/fileContent.lock b/.gradle/4.4/fileContent/fileContent.lock deleted file mode 100644 index 14ff664..0000000 Binary files a/.gradle/4.4/fileContent/fileContent.lock and /dev/null differ diff --git a/.gradle/4.4/fileHashes/fileHashes.bin b/.gradle/4.4/fileHashes/fileHashes.bin deleted file mode 100644 index c39727b..0000000 Binary files a/.gradle/4.4/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/4.4/fileHashes/fileHashes.lock b/.gradle/4.4/fileHashes/fileHashes.lock deleted file mode 100644 index fab72b2..0000000 Binary files a/.gradle/4.4/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/4.4/fileHashes/resourceHashesCache.bin b/.gradle/4.4/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 2a31ce4..0000000 Binary files a/.gradle/4.4/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/classAnalysis.bin b/.gradle/4.4/javaCompile/classAnalysis.bin deleted file mode 100644 index 6ac27ea..0000000 Binary files a/.gradle/4.4/javaCompile/classAnalysis.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/jarAnalysis.bin b/.gradle/4.4/javaCompile/jarAnalysis.bin deleted file mode 100644 index c0dd0f6..0000000 Binary files a/.gradle/4.4/javaCompile/jarAnalysis.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/javaCompile.lock b/.gradle/4.4/javaCompile/javaCompile.lock deleted file mode 100644 index e375d23..0000000 Binary files a/.gradle/4.4/javaCompile/javaCompile.lock and /dev/null differ diff --git a/.gradle/4.4/javaCompile/taskHistory.bin b/.gradle/4.4/javaCompile/taskHistory.bin deleted file mode 100644 index c2c331a..0000000 Binary files a/.gradle/4.4/javaCompile/taskHistory.bin and /dev/null differ diff --git a/.gradle/4.4/javaCompile/taskJars.bin b/.gradle/4.4/javaCompile/taskJars.bin deleted file mode 100644 index ac64ece..0000000 Binary files a/.gradle/4.4/javaCompile/taskJars.bin and /dev/null differ diff --git a/.gradle/4.4/taskHistory/taskHistory.bin b/.gradle/4.4/taskHistory/taskHistory.bin deleted file mode 100644 index 921129a..0000000 Binary files a/.gradle/4.4/taskHistory/taskHistory.bin and /dev/null differ diff --git a/.gradle/4.4/taskHistory/taskHistory.lock b/.gradle/4.4/taskHistory/taskHistory.lock deleted file mode 100644 index a3fe700..0000000 Binary files a/.gradle/4.4/taskHistory/taskHistory.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 2a7034a..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index b1777bf..0000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Wed Aug 01 16:28:40 CEST 2018 -gradle.version=4.4 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 33cbc18..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/app/src/main/java/de/overview/wg/its/mispbump/QrSyncActivity.java b/app/src/main/java/de/overview/wg/its/mispbump/QrSyncActivity.java index 156edf7..7c61003 100644 --- a/app/src/main/java/de/overview/wg/its/mispbump/QrSyncActivity.java +++ b/app/src/main/java/de/overview/wg/its/mispbump/QrSyncActivity.java @@ -123,7 +123,7 @@ public class QrSyncActivity extends AppCompatActivity implements View.OnClickLis cameraFragment.setReadQrEnabled(true); TextView info = findViewById(R.id.qr_info); - info.setText("Public Key"); + info.setText(getText(R.string.public_key)); currentScanState = ScanState.public_key; @@ -152,7 +152,7 @@ public class QrSyncActivity extends AppCompatActivity implements View.OnClickLis cameraFragment.setReadQrEnabled(true); TextView info = findViewById(R.id.qr_info); - info.setText("Sync Information"); + info.setText(getString(R.string.sync_information)); currentScanState = ScanState.information; diff --git a/app/src/main/java/de/overview/wg/its/mispbump/cam/CameraFragment.java b/app/src/main/java/de/overview/wg/its/mispbump/cam/CameraFragment.java index 5e9a40a..1916426 100644 --- a/app/src/main/java/de/overview/wg/its/mispbump/cam/CameraFragment.java +++ b/app/src/main/java/de/overview/wg/its/mispbump/cam/CameraFragment.java @@ -203,6 +203,7 @@ public class CameraFragment extends Fragment implements ActivityCompat.OnRequest SparseArray barcodes = barcodeDetector.detect(frame); if (barcodes.size() > 0) { + Log.d(TAG, "onImageAvailable: " + barcodes.valueAt(0).rawValue); parentActivity.onReadQrCode(barcodes.valueAt(0).rawValue); } } diff --git a/app/src/main/res/layout/activity_public_key_exchange.xml b/app/src/main/res/layout/activity_public_key_exchange.xml index 95c86b8..7279957 100644 --- a/app/src/main/res/layout/activity_public_key_exchange.xml +++ b/app/src/main/res/layout/activity_public_key_exchange.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/colorWhite" - android:text="@string/sync_info_let_scan"/> + android:text="@string/sync_information"/> Autentifizierungseinstellungen - Drücken Sie weiter, wenn dieser QR-Code gescannt wurde + Sync Informationen MISP Url benötigt MISP Automatisierungsschlüssel benötigt diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 831be40..0ef9773 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,7 +34,7 @@ Server URL Authkey Credential Settings - Press continue if this QR-Code was scanned + Sync Information Enter MISP base url Enter MISP automation key