From 23ea247cf6bfec4fc9ddaf181ba13c923c1b2981 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 13:56:48 +0530 Subject: [PATCH 01/18] Update rescue ZIP to support rooted Android Pie devices Signed-off-by: Harsh Shandilya --- app/src/main/assets/rescue.dat | Bin 96226 -> 96249 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/assets/rescue.dat b/app/src/main/assets/rescue.dat index 41793961c8c218a3f7358c6473e072b940068b32..594e4df52e45515bb484985acceaeadff05ed204 100644 GIT binary patch delta 499 zcmaF#p7rN@)`l&NdPRa^c|E=iNI+)#$3jN&>H6i29K4|+oD9sjj|jxv0pjV|MU0YQ z<))W)?rSnKFt9N*FlfS+i`PRH7XuZSR&X;gvb+E)0250m`Fk@P3LJg^TXR`9zt$Tz zTP{&9rMM+Wugwm)l(LKWuF7ejvX@GA<*#qqFWjOuE4Z!l{r5B{y{e|?$2jBE9zXn& zc_FmCDVi_CwI)8lOGR?8pS(QV-`grH&#qB=eCVm@9`zN|>g9~sC7pIPZK@6kSxe>l=?MPoD1iA*Okqo{@pMknrm&YwDGeQqV2nC?>E zg&mCkbvDUpZj5+tmA?`23xv%EjGO}zKZ*Y8Ez z+=sOjc_%KHjSrhTBlh{GDA|=$)&Hz5^ETTi(7rbL`u3N?+us*6u3%yTMa%TrWsLSL zpzxnAU&<)W2NFYs{dD$nMkk2ud7$j{jB-XfX0{T>>5fH=vePw77zL(pD`!+=n_mKq GDh2?Xp~M;h delta 462 zcmezQp7qgt)`l&NdPRbcb9Z|&AOV@_iY1KlT%jSH49rHInvn$)4Q0TJm?HBSg%}wa z?lLhjXo3`}PTy6;$WsqeqzA;M72FJrEH9WD7{J8Rz=K|g9R&8i5AVt5<671&*UHh< zF+C{r)@+5_DVKCo%u~~ZrH|Ba=k@g6AbQdE?d;0W_s-q^YjBKkGhfcBU#O$}=EMH(2qSm$X zM98#N3#M9FePsUo__RREmv&|L&kTiIll*Umi=~+cEtH;-wfwq=fbvx}#~I4%qE2`6 z^#8xL6W~aU3Ogsgy-hDh^Uc0XhxuAnFWeS=xW1bG+=-lh%2%s5Z@N9Dv{!S(b-75c zO#(q|T36$~*WWd)+_Y8uDCb7Urj?35HJ)i2$1@jch6>w#@ZoI?pXL94x z&G&=W91E;v+Rj$OxPplV6y(!4l`-10fWmJ2gi=OnK9Cq9gs01uGdjU#MW_3fF|tjs cFK3ivdS5) Date: Wed, 12 Dec 2018 14:04:44 +0530 Subject: [PATCH 02/18] References: Cleanup rescue file copy method Signed-off-by: Harsh Shandilya --- .../java/projekt/substratum/common/References.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/projekt/substratum/common/References.java b/app/src/main/java/projekt/substratum/common/References.java index 9f719362a..912d2a896 100644 --- a/app/src/main/java/projekt/substratum/common/References.java +++ b/app/src/main/java/projekt/substratum/common/References.java @@ -516,14 +516,8 @@ public static void injectRescueArchives(Context context) { if (rescueFileLegacy.exists() && rescueFileLegacy.delete()) { Log.e(SUBSTRATUM_LOG, "Deleted the rescue legacy file!"); } - copyRescueFile(context, "rescue_legacy.dat", - Environment.getExternalStorageDirectory().getAbsolutePath() + - File.separator + "substratum" + - File.separator + "SubstratumRescue_Legacy.zip"); - copyRescueFile(context, "rescue.dat", - Environment.getExternalStorageDirectory().getAbsolutePath() + - File.separator + "substratum" + - File.separator + "SubstratumRescue.zip"); + copyRescueFile(context, "rescue_legacy.dat", rescueFileLegacy.getAbsolutePath()); + copyRescueFile(context, "rescue.dat", rescueFile.getAbsolutePath()); } /** From 4a794e43103ae4140b18adf18a3e3a8964958191 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 14:20:28 +0530 Subject: [PATCH 03/18] Create debug builds with separate package name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Debug builds will now be installed as substratum β with the projekt.substratum.debug package name. Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 4 ++++ app/src/debug/res/values/strings.xml | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 app/src/debug/res/values/strings.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ef75eabca..b7a891154 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -61,6 +61,10 @@ android { isMinifyEnabled = false //proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } + getByName("debug") { + applicationIdSuffix = ".debug" + versionNameSuffix = "-debug" + } } dexOptions { setJavaMaxHeapSize("2048m") diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml new file mode 100644 index 000000000..7afe89390 --- /dev/null +++ b/app/src/debug/res/values/strings.xml @@ -0,0 +1,4 @@ + + + substratum β + From 7711cd4e9f265c82c6a9343605bc4e64a64637c5 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 14:35:26 +0530 Subject: [PATCH 04/18] References: Remove strict mode bypass Signed-off-by: Harsh Shandilya --- app/src/main/java/projekt/substratum/common/References.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/java/projekt/substratum/common/References.java b/app/src/main/java/projekt/substratum/common/References.java index 912d2a896..f3843bfa6 100644 --- a/app/src/main/java/projekt/substratum/common/References.java +++ b/app/src/main/java/projekt/substratum/common/References.java @@ -37,7 +37,6 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Environment; -import android.os.StrictMode; import android.util.Log; import android.util.TypedValue; import android.view.Gravity; @@ -615,9 +614,6 @@ public static void loadDefaultConfig(Context context) { * @return True, if connected to the internet */ public static boolean isNetworkAvailable(Context context) { - StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); - - StrictMode.setThreadPolicy(policy); ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); assert connectivityManager != null; From a0e04a2296566d7d573a95142a366caab9500607 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 14:37:49 +0530 Subject: [PATCH 05/18] SettingsFragment: Change how version string is handled Properly handle debug/non-debug builds Signed-off-by: Harsh Shandilya --- .../projekt/substratum/fragments/SettingsFragment.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java b/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java index f18272e13..060898a3f 100644 --- a/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java +++ b/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java @@ -102,8 +102,12 @@ public void onCreatePreferences( // About Substratum StringBuilder sb = new StringBuilder(); Preference aboutSubstratum = getPreferenceManager().findPreference("about_substratum"); - sb.append(BuildConfig.VERSION_NAME).append(" (").append(BuildConfig.VERSION_CODE).append(")"); - if (BuildConfig.DEBUG) sb.append(" - ").append(BuildConfig.GIT_HASH); + sb.append(BuildConfig.VERSION_NAME); + if (BuildConfig.DEBUG) { + sb.append(" (").append(BuildConfig.GIT_HASH).append(")"); + } else { + sb.append(" (").append(BuildConfig.VERSION_CODE).append(")"); + } aboutSubstratum.setSummary(sb.toString()); aboutSubstratum.setIcon(context.getDrawable(R.mipmap.main_launcher)); aboutSubstratum.setOnPreferenceClickListener( From 1fb5b7dec398f681b8f0524e5288a1ba5f2b05b2 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 14:40:03 +0530 Subject: [PATCH 06/18] References: Default to two column view Signed-off-by: Harsh Shandilya --- app/src/main/java/projekt/substratum/common/References.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/projekt/substratum/common/References.java b/app/src/main/java/projekt/substratum/common/References.java index f3843bfa6..7e4d5aeee 100644 --- a/app/src/main/java/projekt/substratum/common/References.java +++ b/app/src/main/java/projekt/substratum/common/References.java @@ -204,7 +204,7 @@ public class References { public static final int REFRESH_WINDOW_DELAY = 500; // This int controls the default grid count for the theme adapter public static final int MIN_GRID_COUNT = 1; - public static final int DEFAULT_GRID_COUNT = 1; + public static final int DEFAULT_GRID_COUNT = 2; public static final int MAX_GRID_COUNT = 4; // This String controls the default theme setting public static final String APP_THEME = "app_theme"; From 972e55e525ebdbcb68454ce12df6da749779cf25 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 15:23:58 +0530 Subject: [PATCH 07/18] Revert "Create debug builds with separate package name" Themes are configured to restrict access to the projekt.substratum package name, this will have to wait until the updated template is adopted by more themers. This reverts commit 4a794e43103ae4140b18adf18a3e3a8964958191. --- app/build.gradle.kts | 4 ---- app/src/debug/res/values/strings.xml | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 app/src/debug/res/values/strings.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b7a891154..ef75eabca 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -61,10 +61,6 @@ android { isMinifyEnabled = false //proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } - getByName("debug") { - applicationIdSuffix = ".debug" - versionNameSuffix = "-debug" - } } dexOptions { setJavaMaxHeapSize("2048m") diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml deleted file mode 100644 index 7afe89390..000000000 --- a/app/src/debug/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - substratum β - From d179f87d9319751ea0b9cb5e11967c32bef01753 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 15:32:08 +0530 Subject: [PATCH 08/18] Don't set max heap size for dexing Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ef75eabca..83a3ba6bf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -62,9 +62,6 @@ android { //proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } } - dexOptions { - setJavaMaxHeapSize("2048m") - } lintOptions.isAbortOnError = false } From 07c23e2fb0eb241664ca3df7e78cb9863a61bef3 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Dec 2018 15:33:14 +0530 Subject: [PATCH 09/18] Remove DirectAssets logging build config field Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 1 - app/src/main/java/projekt/substratum/common/References.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 83a3ba6bf..e2d6fe75d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -35,7 +35,6 @@ android { versionName = "one thousand thirteen" buildConfigField("java.util.Date", "buildTime", "new java.util.Date(${System.currentTimeMillis()}L)") buildConfigField("String", "GIT_HASH", "\"${gitHash()}\"") - buildConfigField("boolean", "ENHANCED_LOGGING", "false") setProperty("archivesBaseName", "substratum_${gitHash()}") } compileOptions { diff --git a/app/src/main/java/projekt/substratum/common/References.java b/app/src/main/java/projekt/substratum/common/References.java index 7e4d5aeee..462532e96 100644 --- a/app/src/main/java/projekt/substratum/common/References.java +++ b/app/src/main/java/projekt/substratum/common/References.java @@ -51,7 +51,6 @@ import android.widget.TableRow; import android.widget.TextView; import androidx.annotation.Nullable; -import projekt.substratum.BuildConfig; import projekt.substratum.InformationActivity; import projekt.substratum.LauncherActivity; import projekt.substratum.MainActivity; @@ -91,7 +90,7 @@ public class References { public static final boolean ENABLE_EXTRAS_DIALOG = false; // Show a dialog when applying extras public static final boolean ENABLE_AAPT_OUTPUT = false; // WARNING, DEVELOPERS - BREAKS COMPILE public static final boolean ENABLE_PACKAGE_LOGGING = false; // Show time/date/place of install - public static final boolean ENABLE_DIRECT_ASSETS_LOGGING = BuildConfig.ENHANCED_LOGGING; // Self explanatory + public static final boolean ENABLE_DIRECT_ASSETS_LOGGING = false; // Self explanatory public static final boolean BYPASS_SYSTEM_VERSION_CHECK = false; // For developer previews only! public static final boolean BYPASS_SUBSTRATUM_BUILDER_DELETION = false; // Do not delete cache? public static final String SECURITY_UPDATE_WARN_AFTER = "2018-02-01"; From 34f1fe07b5223acceaffdedc680918591beae7d2 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 18:52:29 +0530 Subject: [PATCH 10/18] Revert "References: Remove strict mode bypass" Revive internet functions until I have the time and patience to implement it in a way I don't hate. This reverts commit 7711cd4e9f265c82c6a9343605bc4e64a64637c5. Signed-off-by: Harsh Shandilya --- app/src/main/java/projekt/substratum/common/References.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/projekt/substratum/common/References.java b/app/src/main/java/projekt/substratum/common/References.java index 462532e96..d314e91d9 100644 --- a/app/src/main/java/projekt/substratum/common/References.java +++ b/app/src/main/java/projekt/substratum/common/References.java @@ -37,6 +37,7 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Environment; +import android.os.StrictMode; import android.util.Log; import android.util.TypedValue; import android.view.Gravity; @@ -613,6 +614,9 @@ public static void loadDefaultConfig(Context context) { * @return True, if connected to the internet */ public static boolean isNetworkAvailable(Context context) { + StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); + + StrictMode.setThreadPolicy(policy); ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); assert connectivityManager != null; From f3abfb6cac2c3dd50747fb7a1d967436d9c00c09 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 18:59:49 +0530 Subject: [PATCH 11/18] References: Don't consume exceptions in isNetworkConnected Signed-off-by: Harsh Shandilya --- app/src/main/java/projekt/substratum/common/References.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/projekt/substratum/common/References.java b/app/src/main/java/projekt/substratum/common/References.java index d314e91d9..3ddf54ebe 100644 --- a/app/src/main/java/projekt/substratum/common/References.java +++ b/app/src/main/java/projekt/substratum/common/References.java @@ -626,7 +626,8 @@ public static boolean isNetworkAvailable(Context context) { return activeNetworkInfo != null && activeNetworkInfo.isConnected() && !checkSiteAvailability.equals(""); - } catch (Exception ignored) { + } catch (Exception e) { + e.printStackTrace(); } return false; } From 10fbd65501648a124bba2ef875998700f398d4b2 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 19:00:00 +0530 Subject: [PATCH 12/18] Add missing internet permission How this app worked without it for two years will forever be a mystery to me. Signed-off-by: Harsh Shandilya --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 28c5fb00f..1193fbf2c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:installLocation="internalOnly"> + Date: Sat, 15 Dec 2018 19:01:46 +0530 Subject: [PATCH 13/18] Public release 1014 Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e2d6fe75d..f8eaa7a29 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -31,8 +31,8 @@ android { applicationId = "projekt.substratum" minSdkVersion(24) targetSdkVersion(28) - versionCode = 1013 - versionName = "one thousand thirteen" + versionCode = 1014 + versionName = "one thousand fourteen" buildConfigField("java.util.Date", "buildTime", "new java.util.Date(${System.currentTimeMillis()}L)") buildConfigField("String", "GIT_HASH", "\"${gitHash()}\"") setProperty("archivesBaseName", "substratum_${gitHash()}") From c45e2fd5d3c1c9b43409f499da512a2d35cce33b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 21:30:35 +0530 Subject: [PATCH 14/18] ValidatorUtils: Properly handle fragment related crashes Signed-off-by: Harsh Shandilya --- .../util/helpers/ValidatorUtils.java | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java index 0efeb22cb..876424db3 100644 --- a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java +++ b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java @@ -59,48 +59,47 @@ public checkROMSupportList(SettingsFragment settingsFragment) { protected void onPostExecute(String result) { super.onPostExecute(result); SettingsFragment settingsFragment = ref.get(); - if (settingsFragment == null) return; - try { - if (!Systems.checkThemeInterfacer(settingsFragment.context) && - !Systems.checkSubstratumService(settingsFragment.context)) { - return; - } - - if (!References.isNetworkAvailable(settingsFragment.context)) { - settingsFragment.platformSummary.append('\n') - .append(settingsFragment.getString(R.string.rom_status)) - .append(' ') - .append(settingsFragment.getString(R.string.rom_status_network)); - settingsFragment.systemPlatform.setSummary( - settingsFragment.platformSummary.toString()); - return; - } + if (settingsFragment == null || !settingsFragment.isAdded()) + return; + if (!Systems.checkThemeInterfacer(settingsFragment.context) && + !Systems.checkSubstratumService(settingsFragment.context)) { + return; + } - if (!result.isEmpty()) { - String supportedRom = String.format( - settingsFragment.getString(R.string.rom_status_supported), result); - settingsFragment.platformSummary.append('\n') - .append(settingsFragment.getString(R.string.rom_status)) - .append(' ') - .append(supportedRom); - settingsFragment.systemPlatform.setSummary( - settingsFragment.platformSummary.toString()); - return; - } + if (!References.isNetworkAvailable(settingsFragment.context)) { + settingsFragment.platformSummary.append('\n') + .append(settingsFragment.getString(R.string.rom_status)) + .append(' ') + .append(settingsFragment.getString(R.string.rom_status_network)); + settingsFragment.systemPlatform.setSummary( + settingsFragment.platformSummary.toString()); + return; + } + if (!result.isEmpty()) { + String supportedRom = String.format( + settingsFragment.getString(R.string.rom_status_supported), result); settingsFragment.platformSummary.append('\n') .append(settingsFragment.getString(R.string.rom_status)) .append(' ') - .append(settingsFragment.getString(R.string.rom_status_unsupported)); + .append(supportedRom); settingsFragment.systemPlatform.setSummary( settingsFragment.platformSummary.toString()); - } catch (IllegalStateException ignored) { /* Not much we can do about this */} + return; + } + + settingsFragment.platformSummary.append('\n') + .append(settingsFragment.getString(R.string.rom_status)) + .append(' ') + .append(settingsFragment.getString(R.string.rom_status_unsupported)); + settingsFragment.systemPlatform.setSummary( + settingsFragment.platformSummary.toString()); } @Override protected String doInBackground(String... sUrl) { SettingsFragment settingsFragment = ref.get(); - if (settingsFragment.isAdded() && settingsFragment != null) { + if (settingsFragment.isAdded()) { return Systems.checkFirmwareSupport(settingsFragment.context, sUrl[0], sUrl[1]); } return null; From f56dddd6cb63c301232e51e04652da3087611023 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 21:33:36 +0530 Subject: [PATCH 15/18] Systems: Don't consume exceptions in checkFirmwareSupport Signed-off-by: Harsh Shandilya --- app/src/main/java/projekt/substratum/common/Systems.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/projekt/substratum/common/Systems.java b/app/src/main/java/projekt/substratum/common/Systems.java index cbf7cd72a..0dbdcd5d8 100644 --- a/app/src/main/java/projekt/substratum/common/Systems.java +++ b/app/src/main/java/projekt/substratum/common/Systems.java @@ -691,7 +691,8 @@ public static String checkFirmwareSupport( } } } - } catch (Exception ignored) { + } catch (Exception e) { + e.printStackTrace(); } return supportedRom; } From 9be843755cf90c6c82c3d491e39c0241587d62e2 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 21:35:10 +0530 Subject: [PATCH 16/18] ValidatorUtils: Remove more constant conditions Signed-off-by: Harsh Shandilya --- .../projekt/substratum/util/helpers/ValidatorUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java index 876424db3..8eb69d400 100644 --- a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java +++ b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java @@ -124,7 +124,7 @@ public downloadRepositoryList(SettingsFragment settingsFragment) { protected void onPreExecute() { super.onPreExecute(); SettingsFragment settingsFragment = ref.get(); - if (settingsFragment.isAdded() && settingsFragment != null) { + if (settingsFragment.isAdded()) { if (settingsFragment.getActivity() != null) { settingsFragment.dialog = new Dialog(settingsFragment.getActivity()); settingsFragment.dialog.setContentView(R.layout.validator_dialog); @@ -138,7 +138,7 @@ protected void onPreExecute() { protected void onPostExecute(ArrayList result) { super.onPostExecute(result); SettingsFragment settingsFragment = ref.get(); - if (settingsFragment.isAdded() && settingsFragment != null) { + if (settingsFragment.isAdded()) { Collection erroredPackages = new ArrayList<>(); for (int x = 0; x < settingsFragment.errors.size(); x++) { ValidatorError error = settingsFragment.errors.get(x); @@ -192,7 +192,7 @@ protected ArrayList doInBackground(String... sUrl) { // First, we have to download the repository list into the cache SettingsFragment settingsFragment = ref.get(); ArrayList packages = new ArrayList<>(); - if (settingsFragment.isAdded() && settingsFragment != null) { + if (settingsFragment.isAdded()) { FileDownloader.init( settingsFragment.context, settingsFragment.getString(Systems.IS_OREO ? From 1760a3e75578f827a4dc06e34ce8366f53a2df9b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 21:58:40 +0530 Subject: [PATCH 17/18] ValidatorUtils: Don't crash on null result Signed-off-by: Harsh Shandilya --- .../java/projekt/substratum/util/helpers/ValidatorUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java index 8eb69d400..a4cc4286f 100644 --- a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java +++ b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java @@ -76,7 +76,7 @@ protected void onPostExecute(String result) { return; } - if (!result.isEmpty()) { + if (result != null && !result.isEmpty()) { String supportedRom = String.format( settingsFragment.getString(R.string.rom_status_supported), result); settingsFragment.platformSummary.append('\n') From 52ebfbcdae5c212bf960d69f776480c1621f6f94 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Dec 2018 22:34:17 +0530 Subject: [PATCH 18/18] Public release 1015 Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f8eaa7a29..8cf9e53d3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -31,8 +31,8 @@ android { applicationId = "projekt.substratum" minSdkVersion(24) targetSdkVersion(28) - versionCode = 1014 - versionName = "one thousand fourteen" + versionCode = 1015 + versionName = "one thousand fifteen" buildConfigField("java.util.Date", "buildTime", "new java.util.Date(${System.currentTimeMillis()}L)") buildConfigField("String", "GIT_HASH", "\"${gitHash()}\"") setProperty("archivesBaseName", "substratum_${gitHash()}")