mirror of https://github.com/MISP/misp-bump
delete .gradle files
parent
82a463a528
commit
1caf9ad898
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,2 +0,0 @@
|
|||
#Wed Aug 01 16:28:40 CEST 2018
|
||||
gradle.version=4.4
|
Binary file not shown.
|
@ -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;
|
||||
|
||||
|
|
|
@ -203,6 +203,7 @@ public class CameraFragment extends Fragment implements ActivityCompat.OnRequest
|
|||
SparseArray<Barcode> barcodes = barcodeDetector.detect(frame);
|
||||
|
||||
if (barcodes.size() > 0) {
|
||||
Log.d(TAG, "onImageAvailable: " + barcodes.valueAt(0).rawValue);
|
||||
parentActivity.onReadQrCode(barcodes.valueAt(0).rawValue);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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"/>
|
||||
|
||||
<ImageButton
|
||||
android:contentDescription="@string/exit"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
<string name="credential_settings">Autentifizierungseinstellungen</string>
|
||||
|
||||
<string name="sync_info_let_scan">Drücken Sie weiter, wenn dieser QR-Code gescannt wurde</string>
|
||||
<string name="sync_information">Sync Informationen</string>
|
||||
|
||||
<string name="error_url_required">MISP Url benötigt</string>
|
||||
<string name="error_automation_key">MISP Automatisierungsschlüssel benötigt</string>
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<string name="server_url">Server URL</string>
|
||||
<string name="authkey">Authkey</string>
|
||||
<string name="credential_settings">Credential Settings</string>
|
||||
<string name="sync_info_let_scan">Press continue if this QR-Code was scanned</string>
|
||||
<string name="sync_information">Sync Information</string>
|
||||
|
||||
<string name="error_url_required">Enter MISP base url</string>
|
||||
<string name="error_automation_key">Enter MISP automation key</string>
|
||||
|
|
Loading…
Reference in New Issue