mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix desugar crash on spinner builds.

fork-5.53.8
Cody Henthorne 2022-05-19 16:21:37 -04:00 zatwierdzone przez Alex Hart
rodzic 4d2af5b536
commit cc31417c97
4 zmienionych plików z 7 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
Wyświetl plik

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

9
app/src/main/java/org/thoughtcrime/securesms/util/AppSignatureUtil.java
Wyświetl plik

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

2
app/src/main/java/org/thoughtcrime/securesms/util/SupportEmailUtil.java
Wyświetl plik

@ -83,7 +83,7 @@ public final class SupportEmailUtil {
} }
private static CharSequence getSignalPackage(@NonNull Context context) { 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) { private static CharSequence getRegistrationLockEnabled(@NonNull Context context) {

2
app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
Wyświetl plik

@ -43,7 +43,7 @@ class SpinnerApplicationContext : ApplicationContext() {
this, this,
mapOf( mapOf(
"Device" to "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})", "Device" to "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})",
"Package" to "$packageName (${AppSignatureUtil.getAppSignature(this).orElse("Unknown")})", "Package" to "$packageName (${AppSignatureUtil.getAppSignature(this)})",
"App Version" to "${BuildConfig.VERSION_NAME} (${BuildConfig.CANONICAL_VERSION_CODE}, ${BuildConfig.GIT_HASH})", "App Version" to "${BuildConfig.VERSION_NAME} (${BuildConfig.CANONICAL_VERSION_CODE}, ${BuildConfig.GIT_HASH})",
"Profile Name" to (if (SignalStore.account().isRegistered) Recipient.self().profileName.toString() else "none"), "Profile Name" to (if (SignalStore.account().isRegistered) Recipient.self().profileName.toString() else "none"),
"E164" to (SignalStore.account().e164 ?: "none"), "E164" to (SignalStore.account().e164 ?: "none"),