From 40a2c7d18f974120680da216608741d891f8cb95 Mon Sep 17 00:00:00 2001 From: akaessens <24660231+akaessens@users.noreply.github.com> Date: Sat, 15 Aug 2020 13:51:12 +0200 Subject: [PATCH] cancel scraping if clear is pressed to prevent inconsitent cleared state disable add button to prevent creating empty events --- .../com/akdev/nofbeventscraper/MainActivity.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java index c80b6da..570f6f8 100644 --- a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java +++ b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java @@ -43,6 +43,8 @@ public class MainActivity extends AppCompatActivity { private CollapsingToolbarLayout toolbar_layout; private TextInputLayout input_layout; + private FbScraper scraper; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -64,6 +66,8 @@ public class MainActivity extends AppCompatActivity { toolbar_layout = (CollapsingToolbarLayout) findViewById(R.id.toolbar_layout); + ok_button.setEnabled(false); + paste_button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -240,7 +244,7 @@ public class MainActivity extends AppCompatActivity { if (!str.equals("")) { field_uri_input.setText(str); - FbScraper scraper = new FbScraper(this, field_uri_input.getText().toString()); + scraper = new FbScraper(this, field_uri_input.getText().toString()); scraper.execute(); } @@ -274,6 +278,13 @@ public class MainActivity extends AppCompatActivity { toolbar_image_view.setImageDrawable(null); toolbar_layout.setTitle(getString(R.string.app_name)); + + if (scraper!=null) + { + scraper.cancel(true); + scraper = null; + } + ok_button.setEnabled(false); } public void update(FbEvent event) { @@ -318,6 +329,8 @@ public class MainActivity extends AppCompatActivity { { e.printStackTrace(); } + + ok_button.setEnabled(true); }