summaryrefslogtreecommitdiffstats
path: root/gui/pages.cpp
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-12-10 18:40:43 +0100
committerEthan Yonker <dees_troy@teamw.in>2014-12-10 18:54:02 +0100
commit738be7a3ffec0a4053478d49821c7da9c5fd9ee6 (patch)
tree1c8efbf90b4045d41f7664b0b88a75cff545a729 /gui/pages.cpp
parentcrypto: fix build in < 5.0 tree (diff)
downloadandroid_bootable_recovery-738be7a3ffec0a4053478d49821c7da9c5fd9ee6.tar
android_bootable_recovery-738be7a3ffec0a4053478d49821c7da9c5fd9ee6.tar.gz
android_bootable_recovery-738be7a3ffec0a4053478d49821c7da9c5fd9ee6.tar.bz2
android_bootable_recovery-738be7a3ffec0a4053478d49821c7da9c5fd9ee6.tar.lz
android_bootable_recovery-738be7a3ffec0a4053478d49821c7da9c5fd9ee6.tar.xz
android_bootable_recovery-738be7a3ffec0a4053478d49821c7da9c5fd9ee6.tar.zst
android_bootable_recovery-738be7a3ffec0a4053478d49821c7da9c5fd9ee6.zip
Diffstat (limited to '')
-rw-r--r--gui/pages.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/gui/pages.cpp b/gui/pages.cpp
index b110e3820..bea39e902 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -39,13 +39,8 @@
extern "C" {
#include "../twcommon.h"
#include "../minuitwrp/minui.h"
-#if (ANDROID_VERSION >= 5)
#include "../minzip/SysUtil.h"
#include "../minzip/Zip.h"
-#else
-#include "../minzipold/SysUtil.h"
-#include "../minzipold/Zip.h"
-#endif
}
#include "rapidxml.hpp"
@@ -926,9 +921,7 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string
char* xmlFile = NULL;
PageSet* pageSet = NULL;
int ret;
-#if (ANDROID_VERSION >= 5)
MemMapping map;
-#endif
// Open the XML file
LOGINFO("Loading package: %s (%s)\n", name.c_str(), package.c_str());
@@ -955,7 +948,6 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string
else
{
LOGINFO("Loading zip theme\n");
-#if (ANDROID_VERSION >= 5)
if (!TWFunc::Path_Exists(package))
return -1;
if (sysMapFile(package.c_str(), &map) != 0) {
@@ -967,12 +959,6 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string
sysReleaseMap(&map);
return -1;
}
-#else
- if (mzOpenZipArchive(package.c_str(), &zip)) {
- LOGERR("Failed to open theme zip.\n");
- return -1;
- }
-#endif
pZip = &zip;
const ZipEntry* ui_xml = mzFindZipEntry(&zip, "ui.xml");
if (ui_xml == NULL)
@@ -1020,9 +1006,7 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string
if (pZip) {
mzCloseZipArchive(pZip);
-#if (ANDROID_VERSION >= 5)
sysReleaseMap(&map);
-#endif
}
return ret;
@@ -1030,9 +1014,7 @@ error:
LOGERR("An internal error has occurred.\n");
if (pZip) {
mzCloseZipArchive(pZip);
-#if (ANDROID_VERSION >= 5)
sysReleaseMap(&map);
-#endif
}
if (xmlFile)
free(xmlFile);