From 5ad8287b671f201d2ecfe40bea1cfa01b92ac404 Mon Sep 17 00:00:00 2001 From: Felix Prahl-Kamps Date: Wed, 24 Jul 2019 12:16:51 +0200 Subject: [PATCH] reformat code --- .../circl/mispbump/activities/ExchangeActivity.java | 2 ++ .../lu/circl/mispbump/activities/HomeActivity.java | 2 ++ .../circl/mispbump/activities/ProfileActivity.java | 2 ++ .../circl/mispbump/activities/StartUpActivity.java | 2 ++ .../circl/mispbump/activities/UploadActivity.java | 2 ++ .../mispbump/activities/UploadInfoActivity.java | 5 ++++- .../circl/mispbump/adapters/UploadInfoAdapter.java | 3 ++- .../lu/circl/mispbump/auxiliary/DialogManager.java | 9 +++++---- .../lu/circl/mispbump/auxiliary/MispRestClient.java | 4 +++- .../circl/mispbump/auxiliary/PreferenceManager.java | 7 +++++-- .../circl/mispbump/auxiliary/QrCodeGenerator.java | 4 +++- .../lu/circl/mispbump/auxiliary/RandomString.java | 3 +++ .../lu/circl/mispbump/auxiliary/TileDrawable.kt | 10 ++-------- .../mispbump/customViews/AutoFitTextureView.java | 1 + .../customViews/ExtendedBottomSheetBehavior.java | 2 +- .../mispbump/customViews/ExtendedViewPager.java | 2 ++ .../customViews/FixedAspectRatioFrameLayout.java | 4 +++- .../mispbump/customViews/MaterialPasswordView.java | 2 ++ .../customViews/MaterialPreferenceSwitch.java | 2 ++ .../customViews/MaterialPreferenceText.java | 4 +++- .../lu/circl/mispbump/customViews/UploadAction.java | 3 +++ .../lu/circl/mispbump/fragments/CameraFragment.java | 2 ++ .../mispbump/fragments/PreferencesFragment.java | 2 ++ .../mispbump/fragments/SyncFragmentAdapter.java | 2 ++ .../fragments/UploadCredentialsFragment.java | 5 ++++- .../mispbump/fragments/UploadSettingsFragment.java | 5 +++-- .../mispbump/interfaces/MispRestInterface.java | 4 +++- .../interfaces/OnRecyclerItemClickListener.java | 2 ++ .../lu/circl/mispbump/models/SyncInformation.java | 5 ++++- .../lu/circl/mispbump/models/UploadInformation.java | 13 +++++++++++++ .../models/restModels/MispOrganisation.java | 2 ++ .../circl/mispbump/models/restModels/MispRole.java | 2 ++ .../mispbump/models/restModels/MispServer.java | 10 +++++++--- .../circl/mispbump/models/restModels/MispUser.java | 4 +++- .../mispbump/models/restModels/Organisation.java | 1 + .../lu/circl/mispbump/models/restModels/Role.java | 2 ++ .../lu/circl/mispbump/models/restModels/Server.java | 5 ++++- .../lu/circl/mispbump/models/restModels/User.java | 4 +++- .../circl/mispbump/models/restModels/Version.java | 2 ++ .../lu/circl/mispbump/security/DiffieHellman.java | 2 ++ .../lu/circl/mispbump/security/KeyStoreWrapper.java | 4 +++- 41 files changed, 120 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java index c23d67d..d064820 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/ExchangeActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.Bitmap; @@ -34,6 +35,7 @@ import lu.circl.mispbump.models.SyncInformation; import lu.circl.mispbump.models.UploadInformation; import lu.circl.mispbump.security.DiffieHellman; + public class ExchangeActivity extends AppCompatActivity { private PreferenceManager preferenceManager; 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 ea03d15..26c7f69 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.content.Intent; import android.os.Bundle; import android.util.Log; @@ -24,6 +25,7 @@ import lu.circl.mispbump.auxiliary.PreferenceManager; import lu.circl.mispbump.interfaces.OnRecyclerItemClickListener; import lu.circl.mispbump.models.UploadInformation; + public class HomeActivity extends AppCompatActivity { private List uploadInformationList; diff --git a/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java b/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java index 9ad5cce..58177ec 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/ProfileActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.content.DialogInterface; import android.content.Intent; import android.graphics.Shader; @@ -34,6 +35,7 @@ import lu.circl.mispbump.models.restModels.Role; import lu.circl.mispbump.models.restModels.User; import lu.circl.mispbump.security.KeyStoreWrapper; + public class ProfileActivity extends AppCompatActivity { private CoordinatorLayout rootLayout; diff --git a/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java b/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java index 3345c3d..2f29d5b 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/StartUpActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.content.Intent; import android.os.Bundle; @@ -7,6 +8,7 @@ import androidx.appcompat.app.AppCompatActivity; import lu.circl.mispbump.auxiliary.PreferenceManager; + /** * Starts either the login or home activity. */ diff --git a/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java b/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java index b7b1550..ef34c31 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/UploadActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.content.Intent; import android.os.Bundle; import android.view.MenuItem; @@ -24,6 +25,7 @@ import lu.circl.mispbump.models.restModels.Organisation; import lu.circl.mispbump.models.restModels.Server; import lu.circl.mispbump.models.restModels.User; + public class UploadActivity extends AppCompatActivity { public static String EXTRA_UPLOAD_INFO = "uploadInformation"; diff --git a/app/src/main/java/lu/circl/mispbump/activities/UploadInfoActivity.java b/app/src/main/java/lu/circl/mispbump/activities/UploadInfoActivity.java index 14e5062..66067cb 100644 --- a/app/src/main/java/lu/circl/mispbump/activities/UploadInfoActivity.java +++ b/app/src/main/java/lu/circl/mispbump/activities/UploadInfoActivity.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.activities; + import android.content.Intent; import android.os.Bundle; import android.view.Menu; @@ -29,6 +30,7 @@ import lu.circl.mispbump.fragments.UploadCredentialsFragment; import lu.circl.mispbump.fragments.UploadSettingsFragment; import lu.circl.mispbump.models.UploadInformation; + public class UploadInfoActivity extends AppCompatActivity { public static String EXTRA_UPLOAD_INFO_UUID = "uploadInformationUuid"; @@ -92,7 +94,8 @@ public class UploadInfoActivity extends AppCompatActivity { } @Override - public void negative() {} + public void negative() { + } }); return true; diff --git a/app/src/main/java/lu/circl/mispbump/adapters/UploadInfoAdapter.java b/app/src/main/java/lu/circl/mispbump/adapters/UploadInfoAdapter.java index 2978dc6..7ebcaf1 100644 --- a/app/src/main/java/lu/circl/mispbump/adapters/UploadInfoAdapter.java +++ b/app/src/main/java/lu/circl/mispbump/adapters/UploadInfoAdapter.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.adapters; + import android.content.Context; import android.content.res.ColorStateList; import android.view.LayoutInflater; @@ -18,6 +19,7 @@ import lu.circl.mispbump.R; import lu.circl.mispbump.interfaces.OnRecyclerItemClickListener; import lu.circl.mispbump.models.UploadInformation; + public class UploadInfoAdapter extends RecyclerView.Adapter { private Context context; @@ -114,5 +116,4 @@ public class UploadInfoAdapter extends RecyclerView.Adapter>() {}.getType(); + Type type = new TypeToken>() { + }.getType(); String serializedCreds = keyStoreWrapper.decrypt(preferences.getString(USER_CREDENTIALS, "")); return new Gson().fromJson(serializedCreds, type); } catch (InvalidKeyException | InvalidAlgorithmParameterException | NoSuchPaddingException | BadPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException e) { @@ -359,4 +362,4 @@ public class PreferenceManager { editor.clear(); editor.apply(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/auxiliary/QrCodeGenerator.java b/app/src/main/java/lu/circl/mispbump/auxiliary/QrCodeGenerator.java index 0ff165e..75e37ef 100644 --- a/app/src/main/java/lu/circl/mispbump/auxiliary/QrCodeGenerator.java +++ b/app/src/main/java/lu/circl/mispbump/auxiliary/QrCodeGenerator.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.auxiliary; + import android.app.Activity; import android.graphics.Bitmap; import android.graphics.Point; @@ -13,6 +14,7 @@ import com.google.zxing.common.BitMatrix; import java.util.HashMap; import java.util.Map; + public class QrCodeGenerator { private Activity callingActivity; @@ -32,7 +34,7 @@ public class QrCodeGenerator { size = displaySize.y; } - size = (int)(size * 0.8); + size = (int) (size * 0.8); try { MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); diff --git a/app/src/main/java/lu/circl/mispbump/auxiliary/RandomString.java b/app/src/main/java/lu/circl/mispbump/auxiliary/RandomString.java index a0dc3d9..72402a7 100644 --- a/app/src/main/java/lu/circl/mispbump/auxiliary/RandomString.java +++ b/app/src/main/java/lu/circl/mispbump/auxiliary/RandomString.java @@ -1,9 +1,12 @@ package lu.circl.mispbump.auxiliary; + + import java.security.SecureRandom; import java.util.Locale; import java.util.Objects; import java.util.Random; + public class RandomString { @SuppressWarnings("SpellCheckingInspection") private static final String upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; diff --git a/app/src/main/java/lu/circl/mispbump/auxiliary/TileDrawable.kt b/app/src/main/java/lu/circl/mispbump/auxiliary/TileDrawable.kt index c51c535..a9784fd 100644 --- a/app/src/main/java/lu/circl/mispbump/auxiliary/TileDrawable.kt +++ b/app/src/main/java/lu/circl/mispbump/auxiliary/TileDrawable.kt @@ -1,12 +1,6 @@ package lu.circl.mispbump.auxiliary -import android.graphics.Bitmap -import android.graphics.BitmapShader -import android.graphics.Canvas -import android.graphics.ColorFilter -import android.graphics.Paint -import android.graphics.PixelFormat -import android.graphics.Shader +import android.graphics.* import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable @@ -46,4 +40,4 @@ class TileDrawable(drawable: Drawable, tileMode: Shader.TileMode) : Drawable() { return bmp } -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/customViews/AutoFitTextureView.java b/app/src/main/java/lu/circl/mispbump/customViews/AutoFitTextureView.java index b623747..d7c9c00 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/AutoFitTextureView.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/AutoFitTextureView.java @@ -20,6 +20,7 @@ import android.content.Context; import android.util.AttributeSet; import android.view.TextureView; + /** * A {@link TextureView} that can be adjusted to a specified aspect ratio. */ diff --git a/app/src/main/java/lu/circl/mispbump/customViews/ExtendedBottomSheetBehavior.java b/app/src/main/java/lu/circl/mispbump/customViews/ExtendedBottomSheetBehavior.java index e00643c..967a725 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/ExtendedBottomSheetBehavior.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/ExtendedBottomSheetBehavior.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.customViews; + import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; @@ -9,7 +10,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import com.google.android.material.bottomsheet.BottomSheetBehavior; -import java.util.ConcurrentModificationException; /** * Can disable touch input on bottom sheet. diff --git a/app/src/main/java/lu/circl/mispbump/customViews/ExtendedViewPager.java b/app/src/main/java/lu/circl/mispbump/customViews/ExtendedViewPager.java index 4bc6e95..b02f5b2 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/ExtendedViewPager.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/ExtendedViewPager.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.customViews; + import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; @@ -8,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.viewpager.widget.ViewPager; + public class ExtendedViewPager extends ViewPager { private boolean swipeEnabled; diff --git a/app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java b/app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java index a9fbe20..5cd3126 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/FixedAspectRatioFrameLayout.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.customViews; + import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; @@ -7,6 +8,7 @@ import android.widget.FrameLayout; import lu.circl.mispbump.R; + public class FixedAspectRatioFrameLayout extends FrameLayout { private int mAspectRatioWidth; private int mAspectRatioHeight; @@ -56,4 +58,4 @@ public class FixedAspectRatioFrameLayout extends FrameLayout { MeasureSpec.makeMeasureSpec(finalWidth, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(finalHeight, MeasureSpec.EXACTLY)); } -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPasswordView.java b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPasswordView.java index 1bc09e8..ae6c3d7 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPasswordView.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPasswordView.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.customViews; + import android.content.Context; import android.content.res.TypedArray; import android.text.method.PasswordTransformationMethod; @@ -13,6 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import lu.circl.mispbump.R; + public class MaterialPasswordView extends ConstraintLayout { private TextView titleView, passwordView; diff --git a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java index f065ea2..5281a4b 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceSwitch.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.customViews; + import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; @@ -13,6 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import lu.circl.mispbump.R; + public class MaterialPreferenceSwitch extends ConstraintLayout { private View rootView; diff --git a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceText.java b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceText.java index 5baf106..d63be92 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceText.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/MaterialPreferenceText.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.customViews; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; @@ -14,6 +15,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import lu.circl.mispbump.R; + public class MaterialPreferenceText extends ConstraintLayout { private View rootView; @@ -32,7 +34,7 @@ public class MaterialPreferenceText extends ConstraintLayout { icon = view.findViewById(R.id.material_preference_src); int imageRes = a.getResourceId(R.styleable.MaterialPreferenceText_pref_icon, 0x0); - if (imageRes != 0x0){ + if (imageRes != 0x0) { icon.setImageResource(imageRes); } else { icon.setVisibility(GONE); diff --git a/app/src/main/java/lu/circl/mispbump/customViews/UploadAction.java b/app/src/main/java/lu/circl/mispbump/customViews/UploadAction.java index 76b76eb..4b53dba 100644 --- a/app/src/main/java/lu/circl/mispbump/customViews/UploadAction.java +++ b/app/src/main/java/lu/circl/mispbump/customViews/UploadAction.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.customViews; + import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; @@ -15,6 +16,7 @@ import androidx.core.widget.ImageViewCompat; import lu.circl.mispbump.R; + public class UploadAction extends ConstraintLayout { private Context context; @@ -64,6 +66,7 @@ public class UploadAction extends ConstraintLayout { /** * Displays an error message for the upload action. + * * @param error a string to show or null to hide */ public void setError(String error) { diff --git a/app/src/main/java/lu/circl/mispbump/fragments/CameraFragment.java b/app/src/main/java/lu/circl/mispbump/fragments/CameraFragment.java index 8c87276..e314fe0 100644 --- a/app/src/main/java/lu/circl/mispbump/fragments/CameraFragment.java +++ b/app/src/main/java/lu/circl/mispbump/fragments/CameraFragment.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.fragments; + import android.Manifest; import android.app.Activity; import android.app.AlertDialog; @@ -62,6 +63,7 @@ import java.util.concurrent.TimeUnit; import lu.circl.mispbump.R; import lu.circl.mispbump.customViews.AutoFitTextureView; + public class CameraFragment extends Fragment implements ActivityCompat.OnRequestPermissionsResultCallback { private class ImageProcessingThread extends Thread { diff --git a/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java b/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java index 719733d..1ccb860 100644 --- a/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java +++ b/app/src/main/java/lu/circl/mispbump/fragments/PreferencesFragment.java @@ -1,11 +1,13 @@ package lu.circl.mispbump.fragments; + import android.os.Bundle; import androidx.preference.PreferenceFragmentCompat; import lu.circl.mispbump.R; + public class PreferencesFragment extends PreferenceFragmentCompat { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { diff --git a/app/src/main/java/lu/circl/mispbump/fragments/SyncFragmentAdapter.java b/app/src/main/java/lu/circl/mispbump/fragments/SyncFragmentAdapter.java index 51a1c1e..9e9bad1 100644 --- a/app/src/main/java/lu/circl/mispbump/fragments/SyncFragmentAdapter.java +++ b/app/src/main/java/lu/circl/mispbump/fragments/SyncFragmentAdapter.java @@ -1,10 +1,12 @@ package lu.circl.mispbump.fragments; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; + public class SyncFragmentAdapter extends FragmentPagerAdapter { public CameraFragment cameraFragment_1, cameraFragment_2; diff --git a/app/src/main/java/lu/circl/mispbump/fragments/UploadCredentialsFragment.java b/app/src/main/java/lu/circl/mispbump/fragments/UploadCredentialsFragment.java index 59b304b..d19029c 100644 --- a/app/src/main/java/lu/circl/mispbump/fragments/UploadCredentialsFragment.java +++ b/app/src/main/java/lu/circl/mispbump/fragments/UploadCredentialsFragment.java @@ -18,12 +18,15 @@ import lu.circl.mispbump.customViews.MaterialPasswordView; import lu.circl.mispbump.customViews.MaterialPreferenceText; import lu.circl.mispbump.models.UploadInformation; + public class UploadCredentialsFragment extends Fragment { private View rootLayout; private UploadInformation uploadInformation; - public UploadCredentialsFragment() {} + public UploadCredentialsFragment() { + } + public UploadCredentialsFragment(UploadInformation uploadInformation) { this.uploadInformation = uploadInformation; } diff --git a/app/src/main/java/lu/circl/mispbump/fragments/UploadSettingsFragment.java b/app/src/main/java/lu/circl/mispbump/fragments/UploadSettingsFragment.java index 09a92fe..021c44a 100644 --- a/app/src/main/java/lu/circl/mispbump/fragments/UploadSettingsFragment.java +++ b/app/src/main/java/lu/circl/mispbump/fragments/UploadSettingsFragment.java @@ -1,7 +1,7 @@ package lu.circl.mispbump.fragments; + import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,6 +13,7 @@ import lu.circl.mispbump.R; import lu.circl.mispbump.customViews.MaterialPreferenceSwitch; import lu.circl.mispbump.models.UploadInformation; + public class UploadSettingsFragment extends Fragment { private MaterialPreferenceSwitch allowSelfSigned, push, pull, cache; @@ -85,4 +86,4 @@ public class UploadSettingsFragment extends Fragment { public void setCache(boolean cache) { this.cache.setChecked(cache); } -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/interfaces/MispRestInterface.java b/app/src/main/java/lu/circl/mispbump/interfaces/MispRestInterface.java index e349e81..68ce5e6 100644 --- a/app/src/main/java/lu/circl/mispbump/interfaces/MispRestInterface.java +++ b/app/src/main/java/lu/circl/mispbump/interfaces/MispRestInterface.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.interfaces; + import java.util.List; import lu.circl.mispbump.models.restModels.MispOrganisation; @@ -16,6 +17,7 @@ import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Path; + /** * RetroFit2 interface for communication with misp instances */ @@ -61,4 +63,4 @@ public interface MispRestInterface { @POST("servers/add") Call addServer(@Body Server server); -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/interfaces/OnRecyclerItemClickListener.java b/app/src/main/java/lu/circl/mispbump/interfaces/OnRecyclerItemClickListener.java index ff670ec..c48215b 100644 --- a/app/src/main/java/lu/circl/mispbump/interfaces/OnRecyclerItemClickListener.java +++ b/app/src/main/java/lu/circl/mispbump/interfaces/OnRecyclerItemClickListener.java @@ -1,7 +1,9 @@ package lu.circl.mispbump.interfaces; + import android.view.View; + public interface OnRecyclerItemClickListener { void onClick(View v, T item); } diff --git a/app/src/main/java/lu/circl/mispbump/models/SyncInformation.java b/app/src/main/java/lu/circl/mispbump/models/SyncInformation.java index 9f95f61..607f58b 100644 --- a/app/src/main/java/lu/circl/mispbump/models/SyncInformation.java +++ b/app/src/main/java/lu/circl/mispbump/models/SyncInformation.java @@ -1,7 +1,9 @@ package lu.circl.mispbump.models; + import lu.circl.mispbump.models.restModels.Organisation; + /** * A Class that holds the information needed synchronize two misp instances. * This class can be serialized and passed via QR code. @@ -14,7 +16,8 @@ public class SyncInformation { public String syncUserAuthkey; public String baseUrl; - public SyncInformation() {} + public SyncInformation() { + } @Override public String toString() { diff --git a/app/src/main/java/lu/circl/mispbump/models/UploadInformation.java b/app/src/main/java/lu/circl/mispbump/models/UploadInformation.java index 036bbb2..3c73bdb 100644 --- a/app/src/main/java/lu/circl/mispbump/models/UploadInformation.java +++ b/app/src/main/java/lu/circl/mispbump/models/UploadInformation.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.models; + import androidx.annotation.NonNull; import java.text.SimpleDateFormat; @@ -8,6 +9,7 @@ import java.util.Date; import java.util.Locale; import java.util.UUID; + public class UploadInformation { public enum SyncStatus { @@ -37,6 +39,7 @@ public class UploadInformation { public void setCurrentSyncStatus(SyncStatus status) { currentSyncStatus = status; } + public SyncStatus getCurrentSyncStatus() { return currentSyncStatus; } @@ -44,6 +47,7 @@ public class UploadInformation { public void setLocal(SyncInformation local) { this.local = local; } + public SyncInformation getLocal() { return local; } @@ -51,6 +55,7 @@ public class UploadInformation { public void setRemote(SyncInformation remote) { this.remote = remote; } + public SyncInformation getRemote() { return remote; } @@ -58,6 +63,7 @@ public class UploadInformation { public UUID getUuid() { return uuid; } + public void setUuid(UUID uuid) { this.uuid = uuid; } @@ -65,12 +71,15 @@ public class UploadInformation { public void setDate() { setDate(Calendar.getInstance().getTime()); } + public void setDate(Date date) { this.date = date; } + public Date getDate() { return date; } + public String getDateString() { SimpleDateFormat df = new SimpleDateFormat("dd.MM.yyyy", Locale.getDefault()); return df.format(date); @@ -79,6 +88,7 @@ public class UploadInformation { public boolean isAllowSelfSigned() { return allowSelfSigned; } + public void setAllowSelfSigned(boolean allowSelfSigned) { this.allowSelfSigned = allowSelfSigned; } @@ -86,6 +96,7 @@ public class UploadInformation { public boolean isPull() { return pull; } + public void setPull(boolean pull) { this.pull = pull; } @@ -93,6 +104,7 @@ public class UploadInformation { public boolean isPush() { return push; } + public void setPush(boolean push) { this.push = push; } @@ -100,6 +112,7 @@ public class UploadInformation { public boolean isCached() { return cached; } + public void setCached(boolean cached) { this.cached = cached; } diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/MispOrganisation.java b/app/src/main/java/lu/circl/mispbump/models/restModels/MispOrganisation.java index 033ec5f..f9795b1 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/MispOrganisation.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/MispOrganisation.java @@ -1,8 +1,10 @@ package lu.circl.mispbump.models.restModels; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; + public class MispOrganisation { @SerializedName("Organisation") @Expose diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/MispRole.java b/app/src/main/java/lu/circl/mispbump/models/restModels/MispRole.java index 74ea347..427632c 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/MispRole.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/MispRole.java @@ -1,8 +1,10 @@ package lu.circl.mispbump.models.restModels; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; + public class MispRole { @SerializedName("Role") @Expose diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/MispServer.java b/app/src/main/java/lu/circl/mispbump/models/restModels/MispServer.java index 1e6eaad..efc2fcd 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/MispServer.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/MispServer.java @@ -1,12 +1,16 @@ package lu.circl.mispbump.models.restModels; -import java.util.List; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import java.util.List; + + public class MispServer { - public MispServer() {} + public MispServer() { + } public MispServer(Server server, Organisation organisation, Organisation remoteOrganisation) { this.server = server; @@ -27,4 +31,4 @@ public class MispServer { @Expose public List user; -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/MispUser.java b/app/src/main/java/lu/circl/mispbump/models/restModels/MispUser.java index f4936eb..5cd6855 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/MispUser.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/MispUser.java @@ -1,8 +1,10 @@ package lu.circl.mispbump.models.restModels; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; + public class MispUser { @SerializedName("User") @@ -12,4 +14,4 @@ public class MispUser { public MispUser(User user) { this.user = user; } -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/Organisation.java b/app/src/main/java/lu/circl/mispbump/models/restModels/Organisation.java index a20f1e7..946efaa 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/Organisation.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/Organisation.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.models.restModels; + /** * Information gathered from Misp API about a organisation. */ diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/Role.java b/app/src/main/java/lu/circl/mispbump/models/restModels/Role.java index f016561..3c29a66 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/Role.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/Role.java @@ -1,7 +1,9 @@ package lu.circl.mispbump.models.restModels; + import com.google.gson.annotations.SerializedName; + public class Role { @SerializedName("id") private Integer id; diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/Server.java b/app/src/main/java/lu/circl/mispbump/models/restModels/Server.java index d9f3d52..33b7e0d 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/Server.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/Server.java @@ -1,10 +1,13 @@ package lu.circl.mispbump.models.restModels; + import com.google.gson.annotations.SerializedName; + public class Server { - public Server() {} + public Server() { + } public Server(String name, String url, String authkey, Integer remote_org_id) { this.name = name; diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/User.java b/app/src/main/java/lu/circl/mispbump/models/restModels/User.java index 387aac0..b9965e8 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/User.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/User.java @@ -1,8 +1,10 @@ package lu.circl.mispbump.models.restModels; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; + public class User { public static final int ROLE_ADMIN = 1; @@ -122,4 +124,4 @@ public class User { ", date_modified='" + date_modified + '\'' + '}'; } -} \ No newline at end of file +} diff --git a/app/src/main/java/lu/circl/mispbump/models/restModels/Version.java b/app/src/main/java/lu/circl/mispbump/models/restModels/Version.java index b6c0658..7375dec 100644 --- a/app/src/main/java/lu/circl/mispbump/models/restModels/Version.java +++ b/app/src/main/java/lu/circl/mispbump/models/restModels/Version.java @@ -1,7 +1,9 @@ package lu.circl.mispbump.models.restModels; + import com.google.gson.annotations.SerializedName; + public class Version { @SerializedName("version") diff --git a/app/src/main/java/lu/circl/mispbump/security/DiffieHellman.java b/app/src/main/java/lu/circl/mispbump/security/DiffieHellman.java index 37c03d7..27161c0 100644 --- a/app/src/main/java/lu/circl/mispbump/security/DiffieHellman.java +++ b/app/src/main/java/lu/circl/mispbump/security/DiffieHellman.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.security; + import android.util.Base64; import java.nio.charset.StandardCharsets; @@ -22,6 +23,7 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; + /** * This class provides the functionality generate a shared secret key. * Furthermore it contains the encryption/decryption methods. diff --git a/app/src/main/java/lu/circl/mispbump/security/KeyStoreWrapper.java b/app/src/main/java/lu/circl/mispbump/security/KeyStoreWrapper.java index e9a40af..895b1e1 100644 --- a/app/src/main/java/lu/circl/mispbump/security/KeyStoreWrapper.java +++ b/app/src/main/java/lu/circl/mispbump/security/KeyStoreWrapper.java @@ -1,5 +1,6 @@ package lu.circl.mispbump.security; + import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyProperties; import android.util.Base64; @@ -25,6 +26,7 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKey; import javax.crypto.spec.GCMParameterSpec; + public class KeyStoreWrapper { public static final String USER_INFO_ALIAS = "ALIAS_USER_INFO"; @@ -257,4 +259,4 @@ public class KeyStoreWrapper { byte[] iv; byte[] data; } -} \ No newline at end of file +}