Skip to content
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

Jump to bottom

Update Gradle and Android versions #53

Merged
merged 2 commits into from
Oct 15, 2020
Merged

Update Gradle and Android versions #53

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49ac191
Update Gradle and Android tooling
marukami Oct 14, 2020
af6d6d1
Optimize Imports
marukami Oct 14, 2020
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
Prev Previous commit
Optimize Imports
  • Loading branch information
@marukami
marukami committed Oct 14, 2020
commit af6d6d1db2a96bf84ede38e8c7551f1008a3746b
2 changes: 1 addition & 1 deletion armadillo/src/androidTest/java/at/favre/lib/armadillo/SecureSharedPreferencesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import android.os.Build;
import android.provider.Settings;

import androidx.test.core.app.ApplicationProvider;
import androidx.test.annotation.UiThreadTest;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Test;
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/main/java/at/favre/lib/armadillo/Armadillo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.SharedPreferences;
import android.os.Build;
import android.provider.Settings;

import androidx.annotation.Nullable;

import java.security.Provider;
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/main/java/at/favre/lib/armadillo/ArmadilloSharedPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.favre.lib.armadillo;

import android.content.SharedPreferences;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

Expand Down
3 changes: 2 additions & 1 deletion armadillo/src/main/java/at/favre/lib/armadillo/DerivedPasswordCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package at.favre.lib.armadillo;

import androidx.annotation.Nullable;
import android.util.LruCache;

import androidx.annotation.Nullable;

import java.security.SecureRandom;

import at.favre.lib.bytes.Bytes;
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/main/java/at/favre/lib/armadillo/EncryptionFingerprintFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import android.content.pm.Signature;
import android.os.Build;
import android.provider.Settings;

import androidx.annotation.Nullable;

import java.io.ByteArrayOutputStream;
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/main/java/at/favre/lib/armadillo/OnSecurePreferenceChangeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.favre.lib.armadillo;

import android.content.SharedPreferences;

import androidx.annotation.NonNull;

/**
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/main/java/at/favre/lib/armadillo/PBKDF2KeyStretcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.favre.lib.armadillo;

import android.os.StrictMode;

import androidx.annotation.Nullable;

import java.security.NoSuchAlgorithmException;
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/main/java/at/favre/lib/armadillo/SecureSharedPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.StrictMode;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

Expand Down
1 change: 1 addition & 0 deletions armadillo/src/main/java/at/favre/lib/armadillo/SharedPreferenceChangeListenerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.favre.lib.armadillo;

import android.content.SharedPreferences;

import androidx.annotation.NonNull;

/**
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/test/java/at/favre/lib/armadillo/BrokenBcryptKeyStretcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.favre.lib.armadillo;

import android.os.StrictMode;

import androidx.annotation.NonNull;

import org.junit.Test;
Expand Down
1 change: 1 addition & 0 deletions armadillo/src/test/java/at/favre/lib/armadillo/MockSharedPref.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.favre.lib.armadillo;

import android.content.SharedPreferences;

import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;

Expand Down
1 change: 1 addition & 0 deletions armadillo/src/test/java/at/favre/lib/armadillo/OnSecurePreferenceChangeListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.favre.lib.armadillo;

import android.content.SharedPreferences;

import androidx.annotation.NonNull;

import org.junit.After;
Expand Down