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

Merge remote-tracking branch 'origin/gl4es' into gl4es

Browse Source
This commit is contained in:
LegacyGamerHD 2020-07-30 16:28:25 +02:00
commit 058a280ca4
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1023,9 +1023,13 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
set.getKey().remove("Cipher.RSA"); set.getKey().remove("Cipher.RSA");
for (Provider.Service s : rsaPkcs1Map.values()) { for (Provider.Service s : rsaPkcs1Map.values()) {
set.getKey().put(s.getType(), s.getClassName());
/*
set.getKey().put("Cipher.RSA algorithm", s.getAlgorithm()); set.getKey().put("Cipher.RSA algorithm", s.getAlgorithm());
set.getKey().put("Cipher.RSA className", s.getClassName()); set.getKey().put("Cipher.RSA className", s.getClassName());
set.getKey().put("Cipher.RSA type", s.getType()); set.getKey().put("Cipher.RSA type", s.getType());
*/
} }
} }
} else { } else {
@ -1056,7 +1060,11 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
runOnUiThread(new Runnable(){ runOnUiThread(new Runnable(){
@Override @Override
public void run() { public void run() {
Toast.makeText(MainActivity.this, "Unable to fix RSAPadding. Premium features is limited! Send the file at " + rsaFixFile.getAbsolutePath() + " to the developer", Toast.LENGTH_LONG).show(); Toast.makeText(MainActivity.this, "Unable to fix RSAPadding. Premium features is limited!" +
(Build.VERSION.SDK_INT == 23 ?
"Android 6 currently don't have solution" :
"Send the file at " + rsaFixFile.getAbsolutePath() + " to the developer")
, Toast.LENGTH_LONG).show();
} }
}); });
} }

7
app/src/main/res/values-pl/strings.xml
View File

@ -155,16 +155,11 @@
<string name="control_keyboard">Klawiatura</string> <string name="control_keyboard">Klawiatura</string>
<string name="control_chat">Czat</string> <string name="control_chat">Czat</string>
<string name="control_debug">Debug</string> <string name="control_debug">Debug</string>
<string name="control_zoom">Zoom (C)</string> <string name="control_zoom">Powiększenie (C)</string>
<string name="control_primary">Pri</string> <string name="control_primary">Pri</string>
<string name="control_secondary">Sec</string> <string name="control_secondary">Sec</string>
<string name="control_shift">◇</string> <string name="control_shift">◇</string>
<string name="control_inventory">Inv</string> <string name="control_inventory">Inv</string>
<string name="control_up">▲</string>
<string name="control_left">◀</string>
<string name="control_right">▶</string>
<string name="control_down">▼</string>
<string name="control_jump">⬛</string>
<string name="control_thirdperson">3rd</string> <string name="control_thirdperson">3rd</string>
<string name="control_listplayers">Tab</string> <string name="control_listplayers">Tab</string>
<string name="control_mouse">Mysz</string> <string name="control_mouse">Mysz</string>