Skip to content

Datalossfix2 #463

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
Naitim wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Datalossfix2 #463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b4858b
data loss fix for add dns
Naitim Dec 28, 2021
437e52c
added and fixed add host activity
Naitim Dec 28, 2021
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
57 changes: 57 additions & 0 deletions app/src/main/java/org/jak_linux/dns66/ItemActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
Expand All @@ -24,6 +25,7 @@
import android.view.MotionEvent;
import android.view.View;
import android.widget.AdapterView;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.Switch;
Expand All @@ -39,6 +41,8 @@ public class ItemActivity extends AppCompatActivity {
private Switch stateSwitch;
private ImageView imageView;

private int UIcheck;

public void performFileSearch() {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);

Expand Down Expand Up @@ -80,9 +84,11 @@ protected void onCreate(Bundle savedInstanceState) {
if (intent.getIntExtra("STATE_CHOICES", 3) == 2) {
setContentView(R.layout.activity_item_dns);
setTitle(R.string.activity_edit_dns_server);
UIcheck = 1;
} else {
setContentView(R.layout.activity_item);
setTitle(R.string.activity_edit_filter);
UIcheck = 2;
}

titleText = (TextInputEditText) findViewById(R.id.title);
Expand Down Expand Up @@ -161,6 +167,56 @@ public boolean onTouch(View v, MotionEvent event) {

}

private SharedPreferences spGen;

private boolean isSubmit;

@Override
protected void onPause() {
super.onPause();
SharedPreferences.Editor spGenEditor = spGen.edit();
if(UIcheck == 1) {
if (isSubmit) {
spGenEditor.putString("editTitleDNS", "");
spGenEditor.putString("editLocationDNS", "");
spGenEditor.putBoolean("editStateDNS", true);
} else {
spGenEditor.putString("editTitleDNS", titleText.getText().toString());
spGenEditor.putString("editLocationDNS", locationText.getText().toString());
spGenEditor.putBoolean("editStateDNS", stateSwitch.isChecked());
}
}
else if(UIcheck == 2) {
if (isSubmit) {
spGenEditor.putString("editTitleHost", "");
spGenEditor.putString("editLocationHost", "");
spGenEditor.putInt("editStateHost", 0);
} else {
spGenEditor.putString("editTitleHost", titleText.getText().toString());
spGenEditor.putString("editLocationHost", locationText.getText().toString());
spGenEditor.putInt("editStateHost", stateSpinner.getSelectedItemPosition());
}
}
spGenEditor.commit();
}

@Override
protected void onResume() {
super.onResume();
spGen = getSharedPreferences("MainActivity", MODE_PRIVATE);
if(UIcheck == 1) {
titleText.setText(spGen.getString("editTitleDNS", ""));
locationText.setText(spGen.getString("editLocationDNS", ""));
stateSwitch.setChecked(spGen.getBoolean("editStateDNS", true));
}
else if(UIcheck == 2) {
titleText.setText(spGen.getString("editTitleHost", ""));
locationText.setText(spGen.getString("editLocationHost", ""));
stateSpinner.setSelection(spGen.getInt("editStateHost", 0));
}
isSubmit = false;
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
Expand Down Expand Up @@ -193,6 +249,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
if (stateSwitch != null)
intent.putExtra("ITEM_STATE", stateSwitch.isChecked() ? 1 : 0);
setResult(RESULT_OK, intent);
isSubmit = true;
finish();
break;
}
Expand Down