Skip to content

Commit

Permalink
Merge pull request godotengine#31 from RandomOfNoWhere/android-RAM-mark3
Browse files Browse the repository at this point in the history 
 Decrease RAM used for the android build -Mark 3 godotengine#22
  • Loading branch information
@Bioblaze
Bioblaze authored Oct 16, 2024
2 parents 99fed1c + 94b47e9 commit d684a7d
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 57 deletions.
1 change: 0 additions & 1 deletion platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ open class GodotEditor : GodotActivity() {
if (BuildConfig.BUILD_TYPE == "dev" && WAIT_FOR_DEBUGGER) {
Debug.waitForDebugger()
}

super.onCreate(savedInstanceState)
}

Expand Down
20 changes: 14 additions & 6 deletions platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,10 @@ public static boolean isFilenameValid(String filename) {
File file = new File(path);
file.delete();
} catch (Exception e) {
Log.w(Constants.TAG, "file: '" + path + "' couldn't be deleted", e);
StringBuilder logData = new StringBuilder("file: '");
logData.append(path);
logData.append("' couldn't be deleted");
Log.w(Constants.TAG, logData.toString(), e);
}
}

Expand Down Expand Up @@ -220,9 +223,11 @@ public static String getExpansionAPKFileName(Context c, boolean mainFile, int ve
* Returns the filename (where the file should be saved) from info about a download
*/
static public String generateSaveFileName(Context c, String fileName) {
String path = getSaveFilePath(c)
+ File.separator + fileName;
return path;
StringBuilder path = new StringBuilder();
path.append(getSaveFilePath(c));
path.append(File.separator);
path.append(fileName);
return path.toString();
}

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
Expand All @@ -234,8 +239,11 @@ static public String getSaveFilePath(Context c) {
return c.getObbDir().toString();
} else {
File root = Environment.getExternalStorageDirectory();
String path = root.toString() + Constants.EXP_PATH + c.getPackageName();
return path;
StringBuilder path = new StringBuilder();
path.append(root.toString());
path.append(Constants.EXP_PATH);
path.append(c.getPackageName());
return path.toString();
}
}

Expand Down
11 changes: 7 additions & 4 deletions ...oid/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@ public DownloadThread(DownloadInfo info, DownloaderService service,
mService = service;
mNotification = notification;
mDB = DownloadsDB.getDB(service);
mUserAgent = "APKXDL (Linux; U; Android " + android.os.Build.VERSION.RELEASE + ";"
+ Locale.getDefault().toString() + "; " + android.os.Build.DEVICE + "/"
+ android.os.Build.ID + ")" +
service.getPackageName();
StringBuffer mUserAgentBuffer = new StringBuffer("APKXDL (Linux; U; Android ");
mUserAgentBuffer.append(android.os.Build.VERSION.RELEASE).append(";");
mUserAgentBuffer.append(Locale.getDefault().toString());
mUserAgentBuffer.append("; ").append(android.os.Build.DEVICE).append("/");
mUserAgentBuffer.append(android.os.Build.ID).append(")");
mUserAgentBuffer.append(service.getPackageName());
mUserAgent = mUserAgentBuffer.toString();
}

/**
Expand Down
18 changes: 13 additions & 5 deletions .../java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,8 +809,10 @@ public void allow(int reason) {
// was delivered by Market or
// through
// another mechanism
Log.d(LOG_TAG, "file " + di.mFileName
+ " found. Not downloading.");
StringBuffer logData = new StringBuffer("file ");
logData.append(di.mFileName);
logData.append(" found. Not downloading.");
Log.d(LOG_TAG, logData.toString());
di.mStatus = STATUS_SUCCESS;
di.mTotalBytes = fileSize;
di.mCurrentBytes = fileSize;
Expand Down Expand Up @@ -952,7 +954,10 @@ private void scheduleAlarm(long wakeUp) {
}

if (Constants.LOGV) {
Log.v(Constants.TAG, "scheduling retry in " + wakeUp + "ms");
StringBuffer logData = new StringBuffer("scheduling retry in ");
logData.append(wakeUp);
logData.append("ms");
Log.v(Constants.TAG, logData.toString());
}

String className = getAlarmReceiverClassName();
Expand Down Expand Up @@ -1221,8 +1226,11 @@ public GenerateSaveFileError(int status, String message) {
* download
*/
public String generateTempSaveFileName(String fileName) {
String path = Helpers.getSaveFilePath(this)
+ File.separator + fileName + TEMP_EXT;
StringBuffer pathBuffer = new StringBuffer(Helpers.getSaveFilePath(this));
pathBuffer.append(File.separator);
pathBuffer.append(fileName);
pathBuffer.append(TEMP_EXT);
String path = pathBuffer.toString();
return path;
}

Expand Down
92 changes: 60 additions & 32 deletions ...ndroid/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadsDB.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,31 @@ static public synchronized DownloadsDB getDB(Context paramContext) {

private SQLiteStatement getDownloadByIndexStatement() {
if (null == mGetDownloadByIndex) {
StringBuilder sqlBuffer = new StringBuilder("SELECT ");
sqlBuffer.append(BaseColumns._ID);
sqlBuffer.append(" FROM ");
sqlBuffer.append(DownloadColumns.TABLE_NAME);
sqlBuffer.append(" WHERE ");
sqlBuffer.append(DownloadColumns.INDEX );
sqlBuffer.append(" = ?");
mGetDownloadByIndex = mHelper.getReadableDatabase().compileStatement(
"SELECT " + BaseColumns._ID + " FROM "
+ DownloadColumns.TABLE_NAME + " WHERE "
+ DownloadColumns.INDEX + " = ?");
sqlBuffer.toString());
}
return mGetDownloadByIndex;
}

private SQLiteStatement getUpdateCurrentBytesStatement() {
if (null == mUpdateCurrentBytes) {
StringBuffer sqlBuffer = new StringBuffer("UPDATE ");
sqlBuffer.append(DownloadColumns.TABLE_NAME);
sqlBuffer.append(" SET ");
sqlBuffer.append(DownloadColumns.CURRENTBYTES);
sqlBuffer.append(" = ?" );
sqlBuffer.append(" WHERE ");
sqlBuffer.append(DownloadColumns.INDEX);
sqlBuffer.append(" = ?");
mUpdateCurrentBytes = mHelper.getReadableDatabase().compileStatement(
"UPDATE " + DownloadColumns.TABLE_NAME + " SET " + DownloadColumns.CURRENTBYTES
+ " = ?" +
" WHERE " + DownloadColumns.INDEX + " = ?");
sqlBuffer.toString());
}
return mUpdateCurrentBytes;
}
Expand All @@ -71,13 +82,19 @@ private DownloadsDB(Context paramContext) {
final SQLiteDatabase sqldb = mHelper.getReadableDatabase();
// Query for the version code, the row ID of the metadata (for future
// updating) the status and the flags
Cursor cur = sqldb.rawQuery("SELECT " +
MetadataColumns.APKVERSION + "," +
BaseColumns._ID + "," +
MetadataColumns.DOWNLOAD_STATUS + "," +
MetadataColumns.FLAGS +
" FROM "
+ MetadataColumns.TABLE_NAME + " LIMIT 1", null);
StringBuffer sqlBuffer = new StringBuffer("SELECT ");
sqlBuffer.append(MetadataColumns.APKVERSION);
sqlBuffer.append(",");
sqlBuffer.append(BaseColumns._ID);
sqlBuffer.append(",");
sqlBuffer.append(MetadataColumns.DOWNLOAD_STATUS);
sqlBuffer.append(",");
sqlBuffer.append(MetadataColumns.FLAGS);
sqlBuffer.append(" FROM ");
sqlBuffer.append(MetadataColumns.TABLE_NAME);
sqlBuffer.append(" LIMIT 1");
Cursor cur = sqldb.rawQuery(
sqlBuffer.toString() , null);
if (null != cur && cur.moveToFirst()) {
mVersionCode = cur.getInt(0);
mMetadataRowID = cur.getLong(1);
Expand Down Expand Up @@ -141,24 +158,24 @@ protected static class DownloadsContentDBHelper extends SQLiteOpenHelper {

private String createTableQueryFromArray(String paramString,
String[][] paramArrayOfString) {
StringBuilder localStringBuilder = new StringBuilder();
localStringBuilder.append("CREATE TABLE ");
localStringBuilder.append(paramString);
localStringBuilder.append(" (");
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.append("CREATE TABLE ");
sqlBuilder.append(paramString);
sqlBuilder.append(" (");
int i = paramArrayOfString.length;
for (int j = 0;; j++) {
if (j >= i) {
localStringBuilder
.setLength(localStringBuilder.length() - 1);
localStringBuilder.append(");");
return localStringBuilder.toString();
sqlBuilder
.setLength(sqlBuilder.length() - 1);
sqlBuilder.append(");");
return sqlBuilder.toString();
}
String[] arrayOfString = paramArrayOfString[j];
localStringBuilder.append(' ');
localStringBuilder.append(arrayOfString[0]);
localStringBuilder.append(' ');
localStringBuilder.append(arrayOfString[1]);
localStringBuilder.append(',');
sqlBuilder.append(' ');
sqlBuilder.append(arrayOfString[0]);
sqlBuilder.append(' ');
sqlBuilder.append(arrayOfString[1]);
sqlBuilder.append(',');
}
}

Expand Down Expand Up @@ -209,9 +226,13 @@ public void onCreate(SQLiteDatabase paramSQLiteDatabase) {

public void onUpgrade(SQLiteDatabase paramSQLiteDatabase,
int paramInt1, int paramInt2) {
StringBuffer sqlBuffer = new StringBuffer("Upgrading database from version ");
sqlBuffer.append(paramInt1);
sqlBuffer.append(" to ");
sqlBuffer.append(paramInt2);
sqlBuffer.append(", which will destroy all old data");
Log.w(DownloadsContentDBHelper.class.getName(),
"Upgrading database from version " + paramInt1 + " to "
+ paramInt2 + ", which will destroy all old data");
sqlBuffer.toString());
dropTables(paramSQLiteDatabase);
onCreate(paramSQLiteDatabase);
}
Expand Down Expand Up @@ -365,9 +386,13 @@ public int getLastCheckedVersionCode() {

public boolean isDownloadRequired() {
final SQLiteDatabase sqldb = mHelper.getReadableDatabase();
Cursor cur = sqldb.rawQuery("SELECT Count(*) FROM "
+ DownloadColumns.TABLE_NAME + " WHERE "
+ DownloadColumns.STATUS + " <> 0", null);
StringBuffer sqlBuffer = new StringBuffer("SELECT Count(*) FROM ");
sqlBuffer.append(DownloadColumns.TABLE_NAME);
sqlBuffer.append(" WHERE ");
sqlBuffer.append(DownloadColumns.STATUS);
sqlBuffer.append(" <> 0");
Cursor cur = sqldb.rawQuery(
sqlBuffer.toString(), null);
try {
if (null != cur && cur.moveToFirst()) {
return 0 == cur.getInt(0);
Expand Down Expand Up @@ -422,8 +447,11 @@ public boolean updateMetadata(ContentValues cv) {
return false;
mMetadataRowID = newID;
} else {
StringBuffer metaData = new StringBuffer(BaseColumns._ID);
metaData.append(" = ");
metaData.append(mMetadataRowID);
if (0 == sqldb.update(MetadataColumns.TABLE_NAME, cv,
BaseColumns._ID + " = " + mMetadataRowID, null))
metaData.toString(), null))
return false;
}
return true;
Expand Down
16 changes: 12 additions & 4 deletions platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,12 @@ public static byte[] decode(byte[] source, int off, int len, byte[] decodabet)
"invalid padding byte '=' at byte offset " + i);
} else if ((b4Posn == 3 && bytesLeft > 2)
|| (b4Posn == 4 && bytesLeft > 1)) {
StringBuilder exceptionData = new StringBuilder("padding byte '=' falsely signals end of encoded value ");
exceptionData.append("at offset ");
exceptionData.append(i);
throw new Base64DecoderException(
"padding byte '=' falsely signals end of encoded value "
+ "at offset " + i);
exceptionData.toString()
);
} else if (lastByte != EQUALS_SIGN && lastByte != NEW_LINE) {
throw new Base64DecoderException(
"encoded value has invalid trailing byte");
Expand All @@ -551,8 +554,13 @@ public static byte[] decode(byte[] source, int off, int len, byte[] decodabet)
}
}
} else {
throw new Base64DecoderException("Bad Base64 input character at " + i
+ ": " + source[i + off] + "(decimal)");
StringBuilder exceptionData = new StringBuilder("Bad Base64 input character at ");
exceptionData.append(i);
exceptionData.append(": " );
exceptionData.append(source[i + off]);
exceptionData.append("(decimal)");
throw new Base64DecoderException(
exceptionData.toString() );
}
}

Expand Down
13 changes: 8 additions & 5 deletions platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,14 @@ String[] getParamTypesNames() {

@Override
public String toString() {
return "SignalInfo{"
+
"name='" + name + '\'' +
", paramsTypes=" + Arrays.toString(paramTypes) +
'}';
StringBuilder object = new StringBuilder("SignalInfo{");
object.append("name='");
object.append(name);
object.append('\'');
object.append(", paramsTypes=");
object.append(Arrays.toString(paramTypes));
object.append('}');
return object.toString();
}

@Override
Expand Down

0 comments on commit d684a7d

Please sign in to comment.