Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6634 from Isira-Seneviratne/Use_PackageInfoCompat 

Use PackageInfoCompat.getSignatures().
This commit is contained in:
Robin 2021-08-29 23:13:12 +02:00 committed by GitHub
parent 46f74b908a 9458b9f37d
commit 57ca281c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
View File

@ -4,7 +4,6 @@ import android.app.Application;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.Signature; import android.content.pm.Signature;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@ -16,6 +15,7 @@ import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat; import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.core.content.pm.PackageInfoCompat;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import com.grack.nanojson.JsonObject; import com.grack.nanojson.JsonObject;
@ -34,6 +34,7 @@ import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory; import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.List;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Maybe; import io.reactivex.rxjava3.core.Maybe;
@ -58,20 +59,22 @@ public final class CheckForNewAppVersion {
*/ */
@NonNull @NonNull
private static String getCertificateSHA1Fingerprint(@NonNull final Application application) { private static String getCertificateSHA1Fingerprint(@NonNull final Application application) {
final PackageInfo packageInfo; final List<Signature> signatures;
try { try {
packageInfo = application.getPackageManager().getPackageInfo( signatures = PackageInfoCompat.getSignatures(application.getPackageManager(),
application.getPackageName(), PackageManager.GET_SIGNATURES); application.getPackageName());
} catch (final PackageManager.NameNotFoundException e) { } catch (final PackageManager.NameNotFoundException e) {
ErrorActivity.reportError(application, new ErrorInfo(e, ErrorActivity.reportError(application, new ErrorInfo(e,
UserAction.CHECK_FOR_NEW_APP_VERSION, "Could not find package info")); UserAction.CHECK_FOR_NEW_APP_VERSION, "Could not find package info"));
return ""; return "";
} }
if (signatures.isEmpty()) {
return "";
}
final X509Certificate c; final X509Certificate c;
try { try {
final Signature[] signatures = packageInfo.signatures; final byte[] cert = signatures.get(0).toByteArray();
final byte[] cert = signatures[0].toByteArray();
final InputStream input = new ByteArrayInputStream(cert); final InputStream input = new ByteArrayInputStream(cert);
final CertificateFactory cf = CertificateFactory.getInstance("X509"); final CertificateFactory cf = CertificateFactory.getInstance("X509");
c = (X509Certificate) cf.generateCertificate(input); c = (X509Certificate) cf.generateCertificate(input);