From 41ab6c18ce1d4ea90ee3ea6e40a84f55ed0e2856 Mon Sep 17 00:00:00 2001 From: Felix Prahl-Kamps Date: Fri, 23 Aug 2019 14:05:07 +0200 Subject: [PATCH] code cleanup --- app/src/main/AndroidManifest.xml | 1 - .../mispbump/activities/HomeActivity.java | 6 +- .../activities/NetworkTestActivity.java | 99 ------------------- .../activities/PreferenceActivity.java | 2 +- .../main/res/layout/activity_network_test.xml | 8 -- .../lu/circl/mispbump/ExampleUnitTest.java | 2 +- 6 files changed, 5 insertions(+), 113 deletions(-) delete mode 100644 app/src/main/java/lu/circl/mispbump/activities/NetworkTestActivity.java delete mode 100644 app/src/main/res/layout/activity_network_test.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 169716e..dd0814a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,6 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - 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 db37e29..e714148 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java @@ -144,7 +144,7 @@ public class HomeActivity extends AppCompatActivity { @Override public void failure(String error) { - + Snackbar.make(recyclerView, error, Snackbar.LENGTH_LONG).show(); } }); @@ -161,14 +161,14 @@ public class HomeActivity extends AppCompatActivity { } @Override public void failure(String error) { - + Snackbar.make(recyclerView, error, Snackbar.LENGTH_LONG).show(); } }); } @Override public void failure(String error) { - + Snackbar.make(recyclerView, error, Snackbar.LENGTH_LONG).show(); } }); } diff --git a/app/src/main/java/lu/circl/mispbump/activities/NetworkTestActivity.java b/app/src/main/java/lu/circl/mispbump/activities/NetworkTestActivity.java deleted file mode 100644 index d173f01..0000000 --- a/app/src/main/java/lu/circl/mispbump/activities/NetworkTestActivity.java +++ /dev/null @@ -1,99 +0,0 @@ -package lu.circl.mispbump.activities; - - -import android.os.Bundle; -import android.util.Log; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.util.Pair; - -import java.util.List; - -import lu.circl.mispbump.R; -import lu.circl.mispbump.auxiliary.MispRestClient; -import lu.circl.mispbump.auxiliary.PreferenceManager; -import lu.circl.mispbump.interfaces.MispService; -import lu.circl.mispbump.models.SyncInformation; -import lu.circl.mispbump.models.restModels.MispOrganisation; -import lu.circl.mispbump.models.restModels.MispServer; -import lu.circl.mispbump.models.restModels.Organisation; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; - - -public class NetworkTestActivity extends AppCompatActivity { - - private PreferenceManager preferenceManager; - private MispService service; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_network_test); - - preferenceManager = PreferenceManager.getInstance(NetworkTestActivity.this); - Pair credentials = preferenceManager.getUserCredentials(); - MispRestClient restClient = MispRestClient.getInstance(credentials.first, credentials.second); - service = restClient.getService(); - - loadAllSyncs(); - } - - private void boundSyncInfoToServer() { - List syncInformationList = preferenceManager.getSyncInformationList(); - - for (SyncInformation syncInfo : syncInformationList) { - String authkey = syncInfo.getRemote().getServer().getAuthkey(); - String localUUID = syncInfo.getLocal().getOrganisation().getUuid(); - String foreignUUID = syncInfo.getRemote().getOrganisation().getUuid(); - - - } - } - - private void loadAllSyncs() { - Call> allServersCall = service.getAllServers(); - - allServersCall.enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - if (!response.isSuccessful()) { - return; - } - - List allServers = response.body(); - - assert allServers != null; - - for (MispServer mispServer : allServers) { - loadOrganisation(mispServer.getRemoteOrganisation().getId()); - } - } - @Override - public void onFailure(Call> call, Throwable t) { - - } - }); - } - - private void loadOrganisation(int id) { - Call organisationCall = service.getOrganisation(id); - organisationCall.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (!response.isSuccessful()) { - return; - } - - Organisation org = response.body().organisation; - Log.d("DEBUG", org.toString()); - - } - @Override - public void onFailure(Call call, Throwable t) { - - } - }); - } -} 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 f65dae9..fedd24a 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/PreferenceActivity.java @@ -51,7 +51,7 @@ public class PreferenceActivity extends AppCompatActivity { public static class PreferencesFragment extends PreferenceFragmentCompat { - Preference.OnPreferenceClickListener onDeleteAllSyncsListener; + private Preference.OnPreferenceClickListener onDeleteAllSyncsListener; @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { diff --git a/app/src/main/res/layout/activity_network_test.xml b/app/src/main/res/layout/activity_network_test.xml deleted file mode 100644 index a52bab7..0000000 --- a/app/src/main/res/layout/activity_network_test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java b/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java index 9dbb454..ac2283d 100644 --- a/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java +++ b/app/src/test/java/lu/circl/mispbump/ExampleUnitTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertEquals; */ public class ExampleUnitTest { @Test - public void addition_isCorrect() { + public void additionIsCorrect() { assertEquals(4, 2 + 2); } }