vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to check write permissions before engine launch

Browse source
This commit is contained in:
Alibek Omarov (a1batross) 2017-03-06 00:01:39 +03:00
parent 24dd05dd36
commit 139972e5c8
2 changed files with 189 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
res/values/strings.xml
View file

@ -53,7 +53,20 @@
<string name="update_message">%s is available! Download it now!</string>
<string name="update">Update</string>
<string name="cancel">Cancel</string>
<string name="ok">Ok</string>
<string name="no_updates">No updates was found</string>
<string name="checking_updates">Working...</string>
<string name="immersive_mode">Enable Immersive Mode(fullscreen, KitKat or higher)</string>
<string name="write_failed">Write test has failed</string>
<string name="ask_about_new_basedir_msg">Move your game files somewhere else, for example Android/data/%s or internal memory. At next run I will ask you about folder again.</string>
<string name="lollipop_request_permission_msg">Due to writing politics of newer Android versions, you need to select a root folder of storage where game data is located.</string>
<string name="lollipop_select_folder_btn">Select folder</string>
<!-- These strings must be concat with a "ask_about_new_basedir" string -->
<string name="lollipop_request_permission_fail_msg">Write test has been failed twice. </string>
<string name="kitkat_write_fail_msg">Due to writing politics of Android 4.4, you can't use this storage. </string>
<string name="readonly_fs_fail_msg">Seems you have read-only filesystem. </string>
</resources>

193
src/in/celest/xash3d/XashActivity.java
View file

@ -50,6 +50,9 @@ public class XashActivity extends Activity {
private static Vibrator mVibrator;
private static boolean mHasVibrator;
private static int OPEN_DOCUMENT_TREE_RESULT = 1;
private static int FPICKER_RESULT = 2;
// Joystick constants
public final static byte JOY_HAT_CENTERED = 0; // bitmasks for hat current status
@ -148,23 +151,30 @@ public class XashActivity extends Activity {
// landscapeSensor is not supported until API9
if( sdk < 9 )
setRequestedOrientation(0);
setupEnvironment();
mPref = this.getSharedPreferences("engine", 0);
InstallReceiver.extractPAK(this, false);
if( mPref.getBoolean("folderask", true ) )
{
Log.v(TAG, "folderask == true. Opening FPicker...");
// Set up the surface
mSurface = new EngineSurface(getApplication());
Intent intent = new Intent(this, in.celest.xash3d.FPicker.class);
startActivityForResult( intent, FPICKER_RESULT );
}
else
{
Log.v(TAG, "folderask == false. Checking write permission...");
mLayout = new FrameLayout(this);
mLayout.addView(mSurface);
setContentView(mLayout);
SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
// check write permission and run engine, if possible
String basedir = getStringExtraFromIntent( getIntent(), "basedir", mPref.getString("basedir","/sdcard/xash/"));
checkWritePermission( basedir );
}
if( sdk < 12 ) handler = new JoystickHandler();
else handler = new JoystickHandler_v12();
if( sdk < 12 )
handler = new JoystickHandler();
else
handler = new JoystickHandler_v12();
handler.init();
mPixelFormat = mPref.getInt("pixelformat", 0);
@ -183,6 +193,64 @@ public class XashActivity extends Activity {
mHasVibrator = ( mVibrator != null ) && ( mVibrator.hasVibrator() );
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent resultData)
{
if( resultCode != RESULT_OK )
{
Log.v(TAG, "onActivityResult: result is not OK. Code: " + requestCode + ". Will exit now");
finish();
}
if( requestCode == FPICKER_RESULT )
{
String newBaseDir = resultData.getStringExtra("GetPath");
setNewBasedir( newBaseDir );
setFolderAsk( false ); // don't ask on next run
checkWritePermission( newBaseDir );
}
else if( requestCode == OPEN_DOCUMENT_TREE_RESULT )
{
String basedir = getStringExtraFromIntent( getIntent(), "basedir", mPref.getString("basedir","/sdcard/xash/"));
if( !nativeTestWritePermission( basedir ) )
{
String msg = getString(R.string.lollipop_request_permission_fail_msg) + getString(R.string.ask_about_new_basedir_msg);
new AlertDialog.Builder(this)
.setTitle( R.string.write_failed )
.setMessage( msg )
.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener()
{
public void onClick(DialogInterface dialog, int whichButton)
{
XashActivity act = (XashActivity)getActivity();
act.setFolderAsk( true );
act.finish();
}
})
.setCancelable(false)
.show();
}
}
}
public void setFolderAsk( Boolean b )
{
SharedPreferences.Editor editor = mPref.edit();
editor.putBoolean( "folderask", b );
editor.commit();
}
private void setNewBasedir( String baseDir )
{
SharedPreferences.Editor editor = mPref.edit();
editor.putBoolean( "basedir", baseDir );
editor.commit();
}
private String getStringExtraFromIntent( Intent intent, String extraString, String ifNotFound )
{
String ret = intent.getStringExtra(extraString);
@ -191,14 +259,104 @@ public class XashActivity extends Activity {
return ret;
}
private void checkWritePermission( String basedir )
{
if( !nativeTestWritePermission( basedir ) )
{
Object lock = new Object;
if( sdk > 20 )
{
// OPEN_DOCUMENT_TREE
// first try
new AlertDialog.Builder(this)
.setTitle( R.string.write_failed )
.setMessage( R.string.lollipop_request_permission_msg )
.setPositiveButton( R.string.lollipop_select_folder_btn, new DialogInterface.OnClickListener()
{
public void onClick(DialogInterface dialog, int whichButton)
{
Intent intent = new Intent("android.intent.action.OPEN_DOCUMENT_TREE");
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
getActivity().startActivityForResult(intent, OPEN_DOCUMENT_TREE_RESULT);
}
})
.setCancelable(false)
.show();
}
else if( sdk > 18 )
{
// 4.4 and 4.4W does not allow SD card write at all
String msg = getString(R.string.kitkat_write_fail_msg) + getString(R.string.ask_about_new_basedir_msg);
new AlertDialog.Builder(this)
.setTitle( R.string.write_failed )
.setMessage( msg )
.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener()
{
public void onClick(DialogInterface dialog, int whichButton)
{
XashActivity act = (XashActivity)getActivity();
act.setFolderAsk( true );
act.finish();
}
})
.setCancelable(false)
.show();
}
else
{
String msg = getString(R.string.readonly_fs_fail_msg) + getString(R.string.ask_about_new_basedir_msg);
// Read-only filesystem
// Logically should be never reached
new AlertDialog.Builder(this)
.setTitle( R.string.write_failed )
.setMessage( msg )
.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener()
{
public void onClick(DialogInterface dialog, int whichButton)
{
XashActivity act = (XashActivity)getActivity();
act.setFolderAsk( true );
act.finish();
}
})
.setCancelable(false)
.show();
}
}
else
{
// everything is normal, so launch engine
launchSurfaceAndEngine();
}
}
private void launchSurfaceAndEngine()
{
setupEnvironment();
InstallReceiver.extractPAK(this, false);
// Set up the surface
mSurface = new EngineSurface(getApplication());
mLayout = new FrameLayout(this);
mLayout.addView(mSurface);
setContentView(mLayout);
SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
}
private void setupEnvironment()
{
Intent intent = getIntent();
final String enginedir = getFilesDir().getParentFile().getPath() + "/lib";
// setup envs
mPref = this.getSharedPreferences("engine", 0);
String argv = getStringExtraFromIntent(intent, "argv", mPref.getString("argv", "-dev 3 -log"));
String gamelibdir = getStringExtraFromIntent(intent, "gamelibdir", enginedir);
String gamedir = getStringExtraFromIntent(intent, "gamedir", "valve");
@ -301,6 +459,7 @@ public class XashActivity extends Activity {
public static native void nativeHat(int id, byte hat, byte keycode, boolean down);
public static native void nativeAxis(int id, byte axis, short value);
public static native void nativeJoyButton(int id, byte button, boolean down);
public static native int nativeTestWritePermission( String path );
// for future expansion
public static native void nativeBall(int id, byte ball, short xrel, short yrel);