izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix version checked for OBB to always match manifest version code

Browse Source 
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 6672175 via CL 6672194 via CL 6672197 via CL 6672201 via CL 6672203 via CL 6673471
#ROBOMERGE-BOT: (vundefined-6665479)

[CL 6674115 by chris babcock in Main branch]
This commit is contained in:
chris babcock
2019-05-29 23:53:16 -04:00
parent ecc31aeba9
commit a44d2c2b60
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template
View File

@@ -223,6 +223,7 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
//$${gameActivityImplementsAdditions}$$
ComponentCallbacks2
{
public int VersionCode = 0;
private boolean bAllowIMU = true;
private SensorManager sensorManager;
private Sensor accelerometer;
@@ -2605,9 +2606,9 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
try
{
int Version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
VersionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
int PatchVersion = 0;
nativeSetObbInfo(ProjectName, getApplicationContext().getPackageName(), Version, PatchVersion, AppType);
nativeSetObbInfo(ProjectName, getApplicationContext().getPackageName(), VersionCode, PatchVersion, AppType);
}
catch (Exception e)
{
@@ -2652,6 +2653,7 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
// remember down time and position
downTime = System.currentTimeMillis();
downX = event.getX();
consoleInputBox.requestFocus();
return true;
}
case MotionEvent.ACTION_UP: {
@@ -2795,7 +2797,7 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
// check for OBB file present if we don't have all the files and don't need to verify
if (!HasAllFiles && !VerifyOBBOnStartUp)
{
HasAllFiles = DownloadShim.expansionFilesDelivered(this);
HasAllFiles = DownloadShim.expansionFilesDelivered(this, VersionCode);
}
containerFrameLayout = new FrameLayout(_activity);