diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index ace914c..3316630 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..f24a632 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,116 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
+
-
+
diff --git a/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java b/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java
index aae7569..d3caa5b 100644
--- a/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java
+++ b/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java
@@ -68,35 +68,27 @@ protected void onCreate(Bundle savedInstanceState) {
downloadButton = (Button) findViewById(R.id.button);
editTextField = (EditText) findViewById(R.id.editText);
- selfSignedButton = (RadioButton) findViewById(R.id.radio_pirates);
letsEncryptButton = (RadioButton)findViewById(R.id.radio_ninjas);
customCAButton = (RadioButton) findViewById(R.id.radio_ninjas2);
plainTextButton = (RadioButton) findViewById(R.id.radio_ninjas3);
- selfSignedButton.setOnClickListener(new View.OnClickListener(){
- public void onClick(View arg0){
- editTextField.setText("Self signed cert at https://secure.singleframesecurity.net:444");
- select = 4;
- }
- });
-
letsEncryptButton.setOnClickListener(new View.OnClickListener(){
public void onClick(View arg0){
- editTextField.setText("Proper cert at https://singleframesecurity.net:443");
+ editTextField.setText("Proper cert at https://zs.labs.defdev.eu:443");
select = 3;
}
});
customCAButton.setOnClickListener(new View.OnClickListener(){
public void onClick(View arg0){
- editTextField.setText("Custom CA pinned at https://test.singleframesecurity.net:442");
+ editTextField.setText("Custom CA pinned at https://zs.labs.defdev.eu:444");
select = 2;
}
});
plainTextButton.setOnClickListener(new View.OnClickListener(){
public void onClick(View arg0){
- editTextField.setText("Plain text on http://singleframesecurity.net");
+ editTextField.setText("Plain text on http://zs.labs.defdev.eu");
select = 1;
}
});
@@ -106,13 +98,11 @@ public void onClick(View arg0) {
try {
AsyncTask rt = new ReadTask();
if(select == 1){
- rt.execute("http://singleframesecurity.net/success.html");
+ rt.execute("http://zs.labs.defdev.eu/success.html");
} else if (select == 2){
- rt.execute("https://test.singleframesecurity.net:442/success.html");
+ rt.execute("https://zs.labs.defdev.eu:444/success.html");
} else if (select == 3){
- rt.execute("https://singleframesecurity.net/success.html");
- } else if (select == 4) {
- rt.execute("https://secure.singleframesecurity.net:444/success.html");
+ rt.execute("https://zs.labs.defdev.eu/success.html");
}
String back = rt.get();
editTextField.setText(back);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7c859ff..bc0b95a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -47,13 +47,6 @@
app:layout_constraintTop_toBottomOf="@+id/editText"
tools:layout_editor_absoluteX="0dp">
-
-