diff --git a/.gitignore b/.gitignore index feb6673c..2fbe8a45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ - # Build data +build/ libs/armeabi* libs/x86 obj @@ -21,7 +21,12 @@ android/res/values/git-rev.xml android/src/in/celest/xash3d/XashConfig.java android/lib +# Waf +build_current +*waf-*/ +*waf3-*/ +.lock-waf* +*.lastbuildstate +*.unsuccessfulbuild +__pycache__ *.pyc -.lock-* -.waf* -build*/ diff --git a/android/src/su/xash/engine/XashActivity.java b/android/src/su/xash/engine/XashActivity.java index 5b2c88a1..c9e03d6d 100644 --- a/android/src/su/xash/engine/XashActivity.java +++ b/android/src/su/xash/engine/XashActivity.java @@ -492,6 +492,11 @@ public class XashActivity extends Activity { mEngineReady = true; } + private boolean checkCstrike( String gamelibdir, String packagename, String signature ) + { + return ( !FWGSLib.checkGameLibDir( gamelibdir, packagename ) || + CertCheck.dumbCertificateCheck( getContext(), packagename, signature, false ) ); + } private boolean setupEnvironment() { @@ -512,10 +517,7 @@ public class XashActivity extends Activity { mMinWidth = 640; mMinHeight = 300; - final String allowed = "in.celest.xash3d.cs16client"; - - if( !FWGSLib.checkGameLibDir( gamelibdir, allowed ) || - CertCheck.dumbCertificateCheck( getContext(), allowed, null, true ) ) + if ( !checkCstrike( gamelibdir, "su.xash.cs16client", "AtsVnfclsm6zLW/qxxPk970zgfA=" ) && !checkCstrike( gamelibdir, "in.celest.xash3d.cs16client", null ) ) { finish(); return false;