# This is a combination of 26 commits.

# The first commit's message is:

allow changing OTA url using efidroid.server_url

# This is the commit message #2:

busybox: enable truncate

# This is the commit message #3:

RootToolsEx: createLoopImage: use truncate

# This is the commit message efidroid#4:

OSUpdateProgressServiceTask: fix error message

# This is the commit message efidroid#5:

update gradle to version 2.2.0

# This is the commit message efidroid#6:

update library and build tools versions

# This is the commit message efidroid#7:

gitignore: update from android studio

# This is the commit message efidroid#8:

update version code to 2

# This is the commit message efidroid#9:

fix ArrayIndexOutOfBoundsException while parsing mountinfo

# This is the commit message efidroid#10:

busybox: enable CONFIG_LFS

# This is the commit message efidroid#11:

update gradle to 2.2.1

# This is the commit message efidroid#12:

update build tools to 24.0.3

# This is the commit message efidroid#13:

make backup of firmware partition instead of creating an empty one

# This is the commit message efidroid#14:

improve error reporting for root commands

# This is the commit message efidroid#15:

update version code to 3

# This is the commit message #16:

MountEntry: add getMountOptionsList

# This is the commit message #17:

OperatingSystemEditActivity: hide readonly filesystems

# This is the commit message #18:

add LICENSE

# This is the commit message #19:

remove ostype 'Ubuntu' from the list

# This is the commit message #20:

update gradle to 2.2.2

# This is the commit message #21:

Add new app icon

# This is the commit message #22:

Add new vector icon for about screen

# This is the commit message #23:

Library & build tool updates

# This is the commit message #24:

Changed volley library source

# This is the commit message #25:

Enable ProGuard code & resource shrinking to reduce apk size by 1/3

# This is the commit message #26:

Automatic changes

Author: M1cha

.gitignore

@@ -6,3 +6,4 @@
 .DS_Store
 /build
 /captures
+.externalNativeBuild

.idea/.name

@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

.idea/gradle.xml

@@ -6,14 +6,14 @@ def gitRevision() {
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
         applicationId "org.efidroid.efidroidmanager"
         minSdkVersion 15
-        targetSdkVersion 24
-        versionCode 1
+        targetSdkVersion 25
+        versionCode 3
         versionName "1.0-g${gitRevision()}"
 
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
@@ -22,7 +22,8 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -37,11 +38,11 @@ dependencies {
     compile('com.github.afollestad.material-dialogs:commons:0.8.5.6@aar') {
         transitive = true
     }
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:design:24.2.0'
-    compile 'com.android.support:support-v4:24.2.0'
-    compile 'com.android.support:recyclerview-v7:24.2.0'
-    compile 'com.mcxiaoke.volley:library:1.0.19'
+    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:design:25.0.0'
+    compile 'com.android.support:support-v4:25.0.0'
+    compile 'com.android.support:recyclerview-v7:25.0.0'
+    compile 'com.android.volley:volley:1.0.0'
     compile 'org.ini4j:ini4j:0.5.4'
     compile 'commons-io:commons-io:2.5'
     compile 'com.melnykov:floatingactionbutton:1.3.0'

.idea/modules.xml

@@ -15,3 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Ignore warnings caused by ini4j referencing non Android-runtime classes
+-dontwarn java.beans.*

LICENSE

@@ -1,25 +1,47 @@
 package org.efidroid.efidroidmanager;
 
+import android.content.Context;
 import android.os.Build;
+import android.text.TextUtils;
 
 import org.efidroid.efidroidmanager.models.DeviceInfo;
+import org.efidroid.efidroidmanager.types.SystemPropertiesProxy;
 
 public final class AppConstants {
-    private static final String URL_OTA = "https://raw.githubusercontent.com/efidroid/ota/master";
-    public static final String URL_DEVICES = URL_OTA+"/devices.json";
+    private static final String URL_EFIDROID_SERVER = "https://raw.githubusercontent.com/efidroid";
 
     public static final String DEVICE_NAME = Build.MANUFACTURER.toLowerCase()+"/"+Build.DEVICE.toLowerCase();
+    public static final String SHAREDPREFS_GLOBAL = "org.efidroid.efidroidmanager";
+    public static final String SHAREDPREFS_GLOBAL_LAST_DEVICEINFO_UPDATE = "last_deviceinfo_update";
+
     public static final String PATH_INTERNAL_DEVICES = "devices.json";
     public static final String PATH_INTERNAL_FSTAB = "fstab.multiboot";
 
-    public static final String SHAREDPREFS_GLOBAL = "org.efidroid.efidroidmanager";
-    public static final String SHAREDPREFS_GLOBAL_LAST_DEVICEINFO_UPDATE = "last_deviceinfo_update";
+    private static String getUrlServer(Context context) {
+        String url = SystemPropertiesProxy.get(context, "efidroid.server_url", "");
+        if(TextUtils.isEmpty(url))
+            url = URL_EFIDROID_SERVER;
+
+        return url;
+    }
+
+    public static String getUrlOta(Context context) {
+        return getUrlServer(context)+"/ota/master";
+    }
+
+    public static String getUrlDeviceList(Context context) {
+        return getUrlOta(context)+"/devices.json";
+    }
+
+    public static String getUrlDeviceRepo(Context context, DeviceInfo deviceInfo) {
+        return getUrlServer(context)+"/device/"+deviceInfo.getDeviceName();
+    }
 
-    public static String getDeviceRepoUrl(DeviceInfo deviceInfo) {
-        return "https://raw.githubusercontent.com/efidroid/device/"+deviceInfo.getDeviceName();
+    public static String getUrlDeviceFsTab(Context context, DeviceInfo deviceInfo) {
+        return getUrlDeviceRepo(context, deviceInfo)+"/fstab.multiboot";
     }
 
-    public static String getUpdatesUrl(DeviceInfo deviceInfo) {
-        return URL_OTA+"/"+deviceInfo.getDeviceName()+"/info.json";
+    public static String getUrlUpdates(Context context, DeviceInfo deviceInfo) {
+        return getUrlOta(context)+"/"+deviceInfo.getDeviceName()+"/info.json";
     }
 }