Skip to content

new certs added #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huobb0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

new certs added #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.
137 changes: 112 additions & 25 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/markdown-navigator-enh.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions .idea/markdown-navigator.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 6 additions & 16 deletions app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
});
Expand All @@ -106,13 +98,11 @@ public void onClick(View arg0) {
try {
AsyncTask<String,Integer,String> 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);
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@
app:layout_constraintTop_toBottomOf="@+id/editText"
tools:layout_editor_absoluteX="0dp">

<RadioButton
android:id="@+id/radio_pirates"
android:layout_width="142dp"
android:layout_height="wrap_content"
android:onClick="onSelfSignedClicked"
android:text="self-signed:444" />

<RadioButton
android:id="@+id/radio_ninjas"
android:layout_width="wrap_content"
Expand Down
Loading