From af6bc5a21bbef6a5870f8e49c2cc70c53d4fa352 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 16 Jun 2020 12:03:41 +0300 Subject: Remove ministro code Since Ministro no longer work on recent Android versions (Android 8+), and it hasn't been maintained and the repos are not updated, the existing code is practically a dead code. [ChangeLog][Android] Remove ministro code since it's been unmaintained and not working with recent Android versions. Task-number: QTBUG-85201 Pick-to: 6.2 Change-Id: I18d7b1e209cba3cfd04674060e9bf39aa5a5510f Reviewed-by: BogDan Vatra --- src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java | 4 ---- .../jar/src/org/qtproject/qt/android/QtActivityDelegate.java | 6 ------ 2 files changed, 10 deletions(-) (limited to 'src/android/jar') diff --git a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java index ff321fabde..09a4d1bc91 100644 --- a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java @@ -1151,7 +1151,6 @@ public class ExtractStyle { json.put("width", bmp.getWidth()); json.put("height", bmp.getHeight()); m_drawableCache.put(filename, new DrawableCache(json, drawable)); -// MinistroActivity.nativeChmode(filename, 0644); } catch (JSONException e) { e.printStackTrace(); } @@ -1972,11 +1971,9 @@ public class ExtractStyle { public ExtractStyle(Context context, String extractPath, boolean minimal) { -// Log.i(MinistroService.TAG, "Extract " + extractPath); m_minimal = minimal; m_extractPath = extractPath + "/"; new File(m_extractPath).mkdirs(); -// MinistroActivity.nativeChmode(m_extractPath, 0755); m_context = context; m_theme = context.getTheme(); TypedArray array = m_theme.obtainStyledAttributes(new int[]{ @@ -2027,7 +2024,6 @@ public class ExtractStyle { } jsonWriter.endObject(); jsonWriter.close(); -// MinistroActivity.nativeChmode(m_extractPath+"style.json", 0644); } catch (Exception e) { e.printStackTrace(); diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java index 82e87b0e9c..9c36090c92 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java @@ -119,7 +119,6 @@ public class QtActivityDelegate private static final String ENVIRONMENT_VARIABLES_KEY = "environment.variables"; private static final String APPLICATION_PARAMETERS_KEY = "application.parameters"; private static final String STATIC_INIT_CLASSES_KEY = "static.init.classes"; - private static final String NECESSITAS_API_LEVEL_KEY = "necessitas.api.level"; private static final String EXTRACT_STYLE_KEY = "extract.android.style"; private static final String EXTRACT_STYLE_MINIMAL_KEY = "extract.android.style.option"; @@ -674,14 +673,9 @@ public class QtActivityDelegate return false; } - int necessitasApiLevel = 1; - if (loaderParams.containsKey(NECESSITAS_API_LEVEL_KEY)) - necessitasApiLevel = loaderParams.getInt(NECESSITAS_API_LEVEL_KEY); - m_environmentVariables = loaderParams.getString(ENVIRONMENT_VARIABLES_KEY); String additionalEnvironmentVariables = "QT_ANDROID_FONTS_MONOSPACE=Droid Sans Mono;Droid Sans;Droid Sans Fallback" + "\tQT_ANDROID_FONTS_SERIF=Droid Serif" - + "\tNECESSITAS_API_LEVEL=" + necessitasApiLevel + "\tHOME=" + m_activity.getFilesDir().getAbsolutePath() + "\tTMPDIR=" + m_activity.getFilesDir().getAbsolutePath(); -- cgit v1.2.3