Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix desugar crash on spinner builds.

Browse Source
This commit is contained in:
Cody Henthorne
2022-05-19 16:21:37 -04:00
committed by Alex Hart
parent 4d2af5b536
commit cc31417c97
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
View File

@@ -153,7 +153,7 @@ public class LogSectionSystemInfo implements LogSection {
}
private static String getSigningString(@NonNull Context context) {
return AppSignatureUtil.getAppSignature(context).orElse("Unknown");
return AppSignatureUtil.getAppSignature(context);
}
private static String getPlayServicesString(@NonNull Context context) {

9
app/src/main/java/org/thoughtcrime/securesms/util/AppSignatureUtil.java
View File

@@ -14,7 +14,6 @@ import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Optional;
public final class AppSignatureUtil {
@@ -30,7 +29,8 @@ public final class AppSignatureUtil {
* Only intended to be used for logging.
*/
@SuppressLint("PackageManagerGetSignatures")
public static Optional<String> getAppSignature(@NonNull Context context) {
public static @NonNull String getAppSignature(@NonNull Context context) {
String hash = null;
try {
String packageName = context.getPackageName();
PackageManager packageManager = context.getPackageManager();
@@ -38,14 +38,13 @@ public final class AppSignatureUtil {
Signature[] signatures = packageInfo.signatures;
if (signatures.length > 0) {
String hash = hash(packageName, signatures[0].toCharsString());
return Optional.ofNullable(hash);
hash = hash(packageName, signatures[0].toCharsString());
}
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, e);
}
return Optional.empty();
return hash != null ? hash : "Unknown";
}
private static String hash(String packageName, String signature) {

2
app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
View File

@@ -83,7 +83,7 @@ public final class SupportEmailUtil {
}
private static CharSequence getSignalPackage(@NonNull Context context) {
return String.format("%s (%s)", BuildConfig.APPLICATION_ID, AppSignatureUtil.getAppSignature(context).orElse("Unknown"));
return String.format("%s (%s)", BuildConfig.APPLICATION_ID, AppSignatureUtil.getAppSignature(context));
}
private static CharSequence getRegistrationLockEnabled(@NonNull Context context) {