diff --git a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java index cee3802..d0d7692 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java @@ -14,7 +14,6 @@ import androidx.core.app.ActivityOptionsCompat; import androidx.core.util.Pair; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; @@ -41,8 +40,6 @@ public class HomeActivity extends AppCompatActivity { private PreferenceManager preferenceManager; private MispRestClient restClient; - private SwipeRefreshLayout swipeRefreshLayout; - private List syncInformationList; private RecyclerView recyclerView; private SyncInfoAdapter syncInfoAdapter; @@ -88,6 +85,10 @@ public class HomeActivity extends AppCompatActivity { protected void onResume() { super.onResume(); refreshRecyclerView(); + + if (!preferenceManager.getShowLocalSyncsOnly()) { + fetchRemoteSyncs(); + } } @@ -99,13 +100,6 @@ public class HomeActivity extends AppCompatActivity { FloatingActionButton syncFab = findViewById(R.id.home_fab); syncFab.setOnClickListener(v -> startActivity(new Intent(HomeActivity.this, ExchangeActivity.class))); - - swipeRefreshLayout = findViewById(R.id.swipeRefresh); - swipeRefreshLayout.setOnRefreshListener(() -> { - onSwipeRefresh(); - - syncInfoAdapter.setItems(syncInformationList); - }); } private void initRecyclerView() { @@ -174,12 +168,7 @@ public class HomeActivity extends AppCompatActivity { } } - private void onSwipeRefresh() { - if (preferenceManager.getShowLocalSyncsOnly()) { - swipeRefreshLayout.setRefreshing(false); - return; - } - + private void fetchRemoteSyncs() { restClient.getAllServers(new MispRestClient.AllRawServersCallback() { @Override public void success(List mispServers) { @@ -252,7 +241,6 @@ public class HomeActivity extends AppCompatActivity { } @Override public void failure(String error) { - swipeRefreshLayout.setRefreshing(false); Snackbar.make(recyclerView, error, Snackbar.LENGTH_LONG).show(); } }); @@ -260,20 +248,16 @@ public class HomeActivity extends AppCompatActivity { @Override public void failure(String error) { - swipeRefreshLayout.setRefreshing(false); Snackbar.make(recyclerView, error, Snackbar.LENGTH_LONG).show(); } }); } } - - swipeRefreshLayout.setRefreshing(false); } @Override public void failure(String error) { - Snackbar.make(swipeRefreshLayout, error, Snackbar.LENGTH_SHORT).show(); - swipeRefreshLayout.setRefreshing(false); + Snackbar.make(recyclerView, error, Snackbar.LENGTH_SHORT).show(); } }); } diff --git a/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java b/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java index 86aa0ae..a426aed 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java @@ -63,7 +63,7 @@ public class PreferenceActivity extends AppCompatActivity { SwitchPreference fetchOnlyLocalSyncs = new SwitchPreference(context); fetchOnlyLocalSyncs.setTitle("Display local syncs only"); fetchOnlyLocalSyncs.setSummaryOn("Only those syncs that were made with MISPbump are displayed."); - fetchOnlyLocalSyncs.setSummaryOff("Existing syncs from your MISP instance are fetched, too."); + fetchOnlyLocalSyncs.setSummaryOff("Existing syncs from your MISP instance are fetched (experimental)"); fetchOnlyLocalSyncs.setChecked(preferenceManager.getShowLocalSyncsOnly()); fetchOnlyLocalSyncs.setOnPreferenceChangeListener((preference, newValue) -> { preferenceManager.setShowLocalSyncsOnly((boolean) newValue); diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 6fa8ea7..712727b 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -18,18 +18,11 @@ app:popupTheme="@style/PopupTheme"/> - - - - - + android:layout_height="match_parent" />