TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 17:15:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update MainActivity.java

Browse Source
This commit is contained in:
LegacyGamerHD 2020-09-16 13:29:40 +02:00 committed by GitHub
parent ad5c86b95d
commit 11382a795b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -1103,23 +1103,23 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
*/ */
Map<Provider, Provider.Service> rsaMap, rsaPkcs1Map; Map<Provider, Provider.Service> rsaMap, rsaPkcs1Map;
rsaMap = getCipherServicesMap("Cipher", "RSA"); rsaMap = getCipherServicesMap("Cipher", "AES");
rsaPkcs1Map = getCipherServicesMap("Cipher", "RSA/ECB/PKCS1PADDING"); rsaPkcs1Map = getCipherServicesMap("Cipher", "AES/CBC/PKCS7Padding");
for (Map.Entry<Provider, Provider.Service> set : rsaMap.entrySet()) { for (Map.Entry<Provider, Provider.Service> set : rsaMap.entrySet()) {
System.out.println(set.getKey().getName() + ": "); System.out.println(set.getKey().getName() + ": ");
for (Map.Entry en : set.getKey().entrySet()) { for (Map.Entry en : set.getKey().entrySet()) {
if (en.getKey().toString().contains("Cipher.RSA")) if (en.getKey().toString().contains("Cipher.AES"))
System.out.println(en.getKey().toString() + " = " + en.getValue().toString()); System.out.println(en.getKey().toString() + " = " + en.getValue().toString());
} }
set.getKey().remove("Cipher.RSA SupportedKeyFormats"); set.getKey().remove("Cipher.AES SupportedKeyFormats");
int spend = 0; int spend = 0;
for (Map.Entry<Provider, Provider.Service> s : rsaPkcs1Map.entrySet()) { for (Map.Entry<Provider, Provider.Service> s : rsaPkcs1Map.entrySet()) {
if (spend == 0) { if (spend == 0) {
set.getKey().put("Cipher.RSA", s.getValue().getClassName()); set.getKey().put("Cipher.AES", s.getValue().getClassName());
set.getKey().put("Cipher.RSA SupportedKeyClasses", s.getKey().get("Cipher.RSA/ECB/PKCS1Padding SupportedKeyClasses")); set.getKey().put("Cipher.AES SupportedKeyClasses", s.getKey().get("Cipher.AES/CBC/PKCS7Padding SupportedKeyClasses"));
List<String> rsaAliasList = Modifiable.getServiceAliases(set.getValue()); List<String> rsaAliasList = Modifiable.getServiceAliases(set.getValue());
rsaAliasList.clear(); rsaAliasList.clear();
@ -1138,8 +1138,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
} }
} else { } else {
Collection<Provider.Service> rsaList, rsaPkcs1List; Collection<Provider.Service> rsaList, rsaPkcs1List;
rsaList = getCipherServices("Cipher", "RSA"); rsaList = getCipherServices("Cipher", "AES");
rsaPkcs1List = getCipherServices("Cipher", "RSA/ECB/PKCS1PADDING"); rsaPkcs1List = getCipherServices("Cipher", "AES/CBC/PKCS7Padding");
rsaList.clear(); rsaList.clear();
rsaList.addAll(rsaPkcs1List); rsaList.addAll(rsaPkcs1List);
@ -1272,8 +1272,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
ProviderList providerList = Providers.getProviderList(); ProviderList providerList = Providers.getProviderList();
Map<Provider, Provider.Service> services = null; Map<Provider, Provider.Service> services = null;
// Android 10 // Android 8.1.0
if (Build.VERSION.SDK_INT >= 29) { if (Build.VERSION.SDK_INT >= 27) {
services = new ArrayMap<>(); services = new ArrayMap<>();
Provider.Service service = providerList.getService(type, algorithm); Provider.Service service = providerList.getService(type, algorithm);
services.put(service.getProvider(), service); services.put(service.getProvider(), service);