Skip to content

Commit 44a6430

Browse files
committed
Update classes with newer dependencies versions
1 parent b790d8c commit 44a6430

12 files changed

Lines changed: 26 additions & 25 deletions

trustkit/src/main/java/com/datatheorem/android/trustkit/TrustKit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.pm.ApplicationInfo;
55
import android.content.pm.PackageManager;
66
import android.os.Build;
7-
import android.support.annotation.NonNull;
7+
import androidx.annotation.NonNull;
88
import android.util.Printer;
99

1010
import com.datatheorem.android.trustkit.config.ConfigurationException;

trustkit/src/main/java/com/datatheorem/android/trustkit/config/DomainPinningPolicy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.datatheorem.android.trustkit.config;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import java.net.MalformedURLException;
66
import java.net.URL;
77
import java.util.Arrays;

trustkit/src/main/java/com/datatheorem/android/trustkit/config/PublicKeyPin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.datatheorem.android.trustkit.config;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44
import android.util.Base64;
55
import java.security.MessageDigest;
66
import java.security.NoSuchAlgorithmException;

trustkit/src/main/java/com/datatheorem/android/trustkit/config/TrustKitConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.datatheorem.android.trustkit.config;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.Nullable;
4+
import androidx.annotation.NonNull;
5+
import androidx.annotation.Nullable;
66
import java.io.IOException;
77
import java.security.cert.Certificate;
88
import java.security.cert.CertificateException;

trustkit/src/main/java/com/datatheorem/android/trustkit/config/TrustKitConfigurationParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
import android.content.Context;
5-
import android.support.annotation.NonNull;
5+
import androidx.annotation.NonNull;
66
import android.text.TextUtils;
77
import com.datatheorem.android.trustkit.utils.TrustKitLog;
88
import java.io.IOException;

trustkit/src/main/java/com/datatheorem/android/trustkit/pinning/PinningTrustManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.net.http.X509TrustManagerExtensions;
44
import android.os.Build;
5-
import android.support.annotation.NonNull;
6-
import android.support.annotation.RequiresApi;
5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.RequiresApi;
77
import com.datatheorem.android.trustkit.config.DomainPinningPolicy;
88
import com.datatheorem.android.trustkit.config.PublicKeyPin;
99
import java.security.cert.Certificate;

trustkit/src/main/java/com/datatheorem/android/trustkit/pinning/SystemTrustManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.datatheorem.android.trustkit.pinning;
22

33

4-
import android.support.annotation.NonNull;
4+
import androidx.annotation.NonNull;
55
import java.security.KeyStore;
66
import java.security.KeyStoreException;
77
import java.security.NoSuchAlgorithmException;

trustkit/src/main/java/com/datatheorem/android/trustkit/pinning/TrustManagerBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.datatheorem.android.trustkit.pinning;
22

33
import android.os.Build;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.Nullable;
4+
import androidx.annotation.NonNull;
5+
import androidx.annotation.Nullable;
66
import com.datatheorem.android.trustkit.TrustKit;
77
import com.datatheorem.android.trustkit.config.DomainPinningPolicy;
88
import com.datatheorem.android.trustkit.reporting.BackgroundReporter;

trustkit/src/main/java/com/datatheorem/android/trustkit/reporting/BackgroundReporter.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33

44
import android.content.Context;
55
import android.content.Intent;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.RequiresApi;
8-
import android.support.v4.content.LocalBroadcastManager;
96
import android.util.Base64;
107

8+
import androidx.annotation.NonNull;
9+
import androidx.annotation.RequiresApi;
10+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
11+
1112
import com.datatheorem.android.trustkit.config.DomainPinningPolicy;
1213
import com.datatheorem.android.trustkit.pinning.PinningValidationResult;
1314
import com.datatheorem.android.trustkit.utils.TrustKitLog;
@@ -107,9 +108,7 @@ protected void sendReport(@NonNull PinningFailureReport report,
107108
// Prepare the AsyncTask's arguments
108109
ArrayList<Object> taskParameters = new ArrayList<>();
109110
taskParameters.add(report);
110-
for (URL reportUri : reportUriSet) {
111-
taskParameters.add(reportUri);
112-
}
111+
taskParameters.addAll(reportUriSet);
113112
// Call the task
114113
new BackgroundReporterTask().execute(taskParameters.toArray());
115114
}
@@ -118,9 +117,5 @@ protected void broadcastReport(@NonNull PinningFailureReport report){
118117
Intent intent = new Intent(REPORT_VALIDATION_EVENT);
119118
intent.putExtra(EXTRA_REPORT, report);
120119
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
121-
122-
123-
124-
125120
}
126121
}

trustkit/src/main/java/com/datatheorem/android/trustkit/reporting/BackgroundReporterTask.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
package com.datatheorem.android.trustkit.reporting;
22

33
import android.os.AsyncTask;
4-
import android.support.annotation.RequiresApi;
54
import android.util.Base64;
5+
6+
import androidx.annotation.RequiresApi;
7+
68
import com.datatheorem.android.trustkit.pinning.SystemTrustManager;
79
import com.datatheorem.android.trustkit.utils.TrustKitLog;
10+
811
import java.io.BufferedOutputStream;
912
import java.io.IOException;
1013
import java.io.OutputStream;
1114
import java.net.HttpURLConnection;
1215
import java.net.URL;
1316
import java.security.KeyManagementException;
1417
import java.security.NoSuchAlgorithmException;
18+
1519
import javax.net.ssl.HttpsURLConnection;
1620
import javax.net.ssl.SSLContext;
1721
import javax.net.ssl.SSLSocketFactory;

0 commit comments

Comments
 (0)