diff --git a/.gitignore b/.gitignore index 415a481..c34044a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -# Built application files -*.apk -*.ap_ - # Files for the dex VM *.dex diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 8172229..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -MultiROMMgrProject \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 12cda64..877e35d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,7 +3,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index fc2d64b..3963879 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 54e0425..277c33e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c80f219..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,5 +3,4 @@ - - + \ No newline at end of file diff --git a/MultiROMMgr/MultiROMMgr.iml b/MultiROMMgr/MultiROMMgr.iml deleted file mode 100644 index 7807acc..0000000 --- a/MultiROMMgr/MultiROMMgr.iml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MultiROMMgr/build.gradle b/MultiROMMgr/build.gradle index 169a734..d695f9e 100644 --- a/MultiROMMgr/build.gradle +++ b/MultiROMMgr/build.gradle @@ -1,27 +1,30 @@ buildscript { repositories { mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:3.0.1' } } apply plugin: 'com.android.application' repositories { mavenCentral() + google() } android { - compileSdkVersion 23 - buildToolsVersion '23.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.2' + defaultConfig { minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 27 } buildTypes { debug { - applicationIdSuffix 'debug' + applicationIdSuffix '.debug' versionNameSuffix '-debug' } release { @@ -32,12 +35,12 @@ android { } dependencies { - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:appcompat-v7:23.1.1' + compile 'com.android.support:support-v4:27.0.2' + compile 'com.android.support:appcompat-v7:27.0.2' } android { lintOptions { - abortOnError false + checkReleaseBuilds false } } diff --git a/MultiROMMgr/release/MultiROMMgr-release.apk b/MultiROMMgr/release/MultiROMMgr-release.apk new file mode 100644 index 0000000..6d338f1 Binary files /dev/null and b/MultiROMMgr/release/MultiROMMgr-release.apk differ diff --git a/MultiROMMgr/release/output.json b/MultiROMMgr/release/output.json new file mode 100644 index 0000000..9a79973 --- /dev/null +++ b/MultiROMMgr/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":188},"path":"MultiROMMgr-release.apk","properties":{"packageId":"com.tassadar.multirommgr","split":"","minSdkVersion":"16"}}] \ No newline at end of file diff --git a/MultiROMMgr/src/main/AndroidManifest.xml b/MultiROMMgr/src/main/AndroidManifest.xml index fd8bebc..a4fd7cc 100644 --- a/MultiROMMgr/src/main/AndroidManifest.xml +++ b/MultiROMMgr/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -15,7 +16,8 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + tools:ignore="AllowBackup,GoogleAppIndexingWarning"> + android:exported="false"/> out = Shell.SU.run( - "folders=\"/data/media/0/multirom/ /data/media/multirom/\";" + + "folders=\"/data/media/0/MultiROM/multirom/ /data/media/MultiROM/multirom/\";" + "for f in $folders; do" + " if [ -d \"$f\" ]; then" + " echo \"$f\";" + @@ -399,7 +399,7 @@ public void setRomIcon(Rom rom, String path) { } } - public void setRomIcon(Rom rom, BufferedInputStream in) throws IOException { + private void setRomIcon(Rom rom, BufferedInputStream in) throws IOException { in.mark(Integer.MAX_VALUE); String hash = Utils.calculateChecksumStream(in, "SHA-256"); if(hash == null) diff --git a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/SettingsActivity.java b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/SettingsActivity.java index f346fbd..874d121 100644 --- a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/SettingsActivity.java +++ b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/SettingsActivity.java @@ -18,7 +18,6 @@ package com.tassadar.multirommgr; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; diff --git a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/StatusAsyncTask.java b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/StatusAsyncTask.java index c3a0e88..8535b02 100644 --- a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/StatusAsyncTask.java +++ b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/StatusAsyncTask.java @@ -291,7 +291,7 @@ protected void applyResult() { if(man != null && man.hasCommand("NOTICE")) { String text = man.getCommandArg("NOTICE"); if(text != null) { - String hash = Utils.calculateChecksum(text.getBytes(), "MD5"); + String hash = Utils.calculateChecksum(text.getBytes(), "SHA-256"); SharedPreferences p = MgrApp.getPreferences(); final Set shownHashes = p.getStringSet("shownNotices", null); if(shownHashes == null || !shownHashes.contains(hash)) { diff --git a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/UpdateChecker.java b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/UpdateChecker.java index f2950f8..3be31bc 100644 --- a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/UpdateChecker.java +++ b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/UpdateChecker.java @@ -34,7 +34,7 @@ public class UpdateChecker { private static final int REQ_UPDATE_CHECK = 1; private static final int UPDATE_NOTIFICATION_ID = 1; - public static void setVersions(Device d, MultiROM m, Recovery r) { + static void setVersions(Device d, MultiROM m, Recovery r) { SharedPreferences.Editor p = MgrApp.getPreferences().edit(); if(m != null && r != null) { p.putBoolean("has_versions", true); @@ -44,7 +44,7 @@ public static void setVersions(Device d, MultiROM m, Recovery r) { } else { p.putBoolean("has_versions", false); } - p.commit(); + p.apply(); updateAlarmStatus(); } @@ -63,7 +63,7 @@ public static void lazyUpdateVersions(Device d, String m_ver, String r_ver) { if(r_ver != null) e.putString("last_recovery_ver", r_ver); - e.commit(); + e.apply(); } public static boolean isEnabled() { @@ -76,7 +76,7 @@ private static PendingIntent getIntent(Context ctx, int flags) { return PendingIntent.getBroadcast(ctx, REQ_UPDATE_CHECK, i, flags); } - public static void updateAlarmStatus() { + static void updateAlarmStatus() { Context ctx = MgrApp.getAppContext(); SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(ctx); PendingIntent i = getIntent(ctx, PendingIntent.FLAG_NO_CREATE); diff --git a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/Utils.java b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/Utils.java index 763577e..b11af7b 100644 --- a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/Utils.java +++ b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/Utils.java @@ -318,18 +318,6 @@ public static String getFilenameFromUrl(String url) { return url.substring(idx+1); } - public static String calculateMD5(String file) { - return calculateMD5(new File(file)); - } - - public static String calculateMD5(File file) { - return calculateChecksum(file, "MD5"); - } - - public static String calculateSHA256(String file) { - return calculateSHA256(new File(file)); - } - public static String calculateSHA256(File file) { return calculateChecksum(file, "SHA-256"); } diff --git a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/ChangelogActivity.java b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/ChangelogActivity.java index fe280f5..adc5a84 100644 --- a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/ChangelogActivity.java +++ b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/ChangelogActivity.java @@ -23,7 +23,6 @@ import android.support.v7.app.ActionBar; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; diff --git a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/InstallActivity.java b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/InstallActivity.java index 6194906..c45c336 100644 --- a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/InstallActivity.java +++ b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/InstallActivity.java @@ -27,7 +27,6 @@ import android.os.Build; import android.os.Bundle; import android.os.IBinder; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity; import android.text.Html; import android.text.Spanned; diff --git a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/MultiROMTask.java b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/MultiROMTask.java index 48a3f91..b140782 100644 --- a/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/MultiROMTask.java +++ b/MultiROMMgr/src/main/java/com/tassadar/multirommgr/installfragment/MultiROMTask.java @@ -74,8 +74,8 @@ protected boolean downloadInstallationFile(Manifest.InstallationFile f, File des if(size < f.size) { startOffset = size; } else { - String md5 = Utils.calculateMD5(f.destFile); - if(f.md5.equals(md5)) { + String sha256 = Utils.calculateSHA256(f.destFile); + if(f.sha256.equals(sha256)) { m_listener.onInstallLog(Utils.getString(R.string.skipping_file, filename)); return true; } @@ -114,8 +114,8 @@ protected boolean downloadInstallationFile(Manifest.InstallationFile f, File des } } else { m_listener.onInstallLog(Utils.getString(R.string.checking_file, filename)); - String md5 = Utils.calculateMD5(f.destFile); - if(f.md5.isEmpty() || f.md5.equals(md5)) + String sha256 = Utils.calculateSHA256(f.destFile); + if(f.sha256.isEmpty() || f.sha256.equals(sha256)) m_listener.onInstallLog(Utils.getString(R.string.ok)); else { m_listener.onInstallLog(Utils.getString(R.string.failed)); diff --git a/MultiROMMgr/src/main/res/values-cs/strings.xml b/MultiROMMgr/src/main/res/values-cs/strings.xml index 1d25534..33ecb8e 100644 --- a/MultiROMMgr/src/main/res/values-cs/strings.xml +++ b/MultiROMMgr/src/main/res/values-cs/strings.xml @@ -144,7 +144,7 @@ Ukončit - Nepodporovaná verze Androidu! + Nepodporovaná verze Androidu! Android L developer preview není nadále podporované a obsahuje chyby, kvůli kterým verze 1.163 a vyšší této aplikace nefunguje.\nPoslední funkční verzi, 1.152, můžete stáhnout zde:\nhttp://tasemnice.eu/perm/MultiROMMgr-v1.152.apk\n\nPřed instalací této starší verze musíte nejdříve úplně odinstalovat tuto. Toto zařízení není oficálně podporováno! Toto zařízení není oficálně podporováno autorem MultiROM. Neobdržíte od něj žádnou pomoc s jakýmkoliv problémem, místo toho se zeptejte toho člověka, který MultiROM na vaše zařízení naportoval.\n\nNa XDA-developers fórech pravděpodobně existuje thread o portu pro vaše zařízení, tam můžete najít pomoc. Odkazy na tyto fóra můžete najít v popisu této aplikace na Play Store. diff --git a/MultiROMMgr/src/main/res/values-ko/strings.xml b/MultiROMMgr/src/main/res/values-ko/strings.xml index c99b5af..36520d1 100644 --- a/MultiROMMgr/src/main/res/values-ko/strings.xml +++ b/MultiROMMgr/src/main/res/values-ko/strings.xml @@ -136,4 +136,7 @@ 설치/업데이트 ROM 관리 + ROM 을 부팅하시겠습니까? + 이 디바이스는 공식적으로 지원되지 않습니다! + 이 디바이스는 MultiROM 의 저자에 의해서 공식적으로 지원되지 않습니다. 어떤한 도움도 그로 부터 받을 수 없습니다. 대신에 이 디바이스를 위해 포팅한 커뮤니티 회원 개발자에게 요청하십시오. \n\n이 디바이스의 포트에 관한 쓰레드는 XDA 개발자 포럼에 존재할 것입니다. 그곳에서 도움을 얻을 수 있습니다. 현재 각 디바이스에 대한 XDA 쓰레드들의 링크들은 플레이 스토어의 설명 부분에 있습니다. diff --git a/MultiROMMgrProject.iml b/MultiROMMgrProject.iml deleted file mode 100644 index f185b57..0000000 --- a/MultiROMMgrProject.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 495c503..11782c3 100644 --- a/build.gradle +++ b/build.gradle @@ -1 +1,7 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + google() + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3c27bb7..186c6c2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jan 12 20:03:28 CET 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +#Thu Sep 07 04:28:50 KST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip