APK refactor

Author: devshgraphicsprogramming

src/nbl/system/CAPKResourcesArchive.cpp

@@ -7,12 +7,12 @@ using namespace nbl::system;
 #include <android/native_activity.h>
 #include <android/asset_manager.h>
 
-CAPKResourcesArchive::CAPKResourcesArchive(const path& _path, system::logger_opt_smart_ptr&& logger, ANativeActivity* act, JNIEnv* jniEnv)
-	: CFileArchive(path(_path),std::move(logger),computeItems(_path.string(),act->assetManager,jniEnv)), m_mgr(act->assetManager), m_activity(act)
+CAPKResourcesArchive::CAPKResourcesArchive(const path& _path, system::logger_opt_smart_ptr&& logger, ANativeActivity* activity, JNIEnv* jniEnv)
+	: CFileArchive(path(_path),std::move(logger),computeItems(_path.string(),activity,jniEnv)), m_mgr(activity->assetManager)
 {
 }
 
-core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const std::string& asset_path, AAssetManager* mgr, JNIEnv* env)
+core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const std::string& asset_path, ANativeActivity* activity, JNIEnv* jniEnv)
 {
 	auto context_object = activity->clazz;
 	auto getAssets_method = env->GetMethodID(env->GetObjectClass(context_object), "getAssets", "()Landroid/content/res/AssetManager;");
@@ -38,7 +38,7 @@ core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const
 			auto& item = result.emplace_back();
 			item.pathRelativeToArchive = filename;
 			{
-				AAsset* asset = AAssetManager_open(mgr,filename,AASSET_MODE_STREAMING);
+				AAsset* asset = AAssetManager_open(activity->assetManager,filename,AASSET_MODE_STREAMING);
 				item.size = AAsset_getLength(asset);
 				AAsset_close(asset);
 			}

src/nbl/system/CAPKResourcesArchive.h

@@ -17,16 +17,15 @@ namespace nbl::system
 class CAPKResourcesArchive final : public CFileArchive
 {
 	public:
-		CAPKResourcesArchive(const path& _path, system::logger_opt_smart_ptr&& logger, ANativeActivity* act, JNIEnv* jniEnv);
+		CAPKResourcesArchive(const path& _path, system::logger_opt_smart_ptr&& logger, ANativeActivity* activity, JNIEnv* jniEnv);
 
 	protected:
-		static core::vector<SListEntry> computeItems(const std::string& asset_path, AAssetManager* mgr, JNIEnv* env);
+		static core::vector<SListEntry> computeItems(const std::string& asset_path, ANativeActivity* activity, JNIEnv* jniEnv);
 
 		file_buffer_t getFileBuffer(const IFileArchive::SListEntry* item) override;
 
 
 		AAssetManager* m_mgr;
-		ANativeActivity* m_activity;
 };
 
 }