Revert "add bundlehash"

This reverts commit 210e6bb.

Author: sunnylqm

android/jni/Android.mk

@@ -24,10 +24,8 @@ LOCAL_SRC_FILES := \
 	../../cpp/patch_core/archive_patch_core.cpp \
 	../../cpp/patch_core/patch_core.cpp \
 	../../cpp/patch_core/patch_core_android.cpp \
-	../../cpp/patch_core/sha256_util.cpp \
 	../../cpp/patch_core/state_core.cpp \
 	../../cpp/patch_core/update_core_android.cpp \
-	lzma/C/Sha256.c \
 	$(Hdp_Files)
 
 include $(BUILD_SHARED_LIBRARY)

android/lib/arm64-v8a/librnupdate.so

@@ -4,15 +4,11 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
 import android.os.Build;
 import android.os.Environment;
 import android.util.Log;
 import com.facebook.react.ReactInstanceManager;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
@@ -39,9 +35,6 @@ public class UpdateContext {
     private static final int STATE_OP_CLEAR_ROLLBACK_MARK = 5;
     private static final int STATE_OP_RESOLVE_LAUNCH = 6;
     private static final String KEY_FIRST_LOAD_MARKED = "firstLoadMarked";
-    private static final String KEY_BUNDLE_HASH_CACHE_IDENTITY = "bundleHashCacheIdentity";
-    private static final String KEY_BUNDLE_HASH_CACHE_VALUE = "bundleHashCacheValue";
-    private static final String EMBEDDED_BUNDLE_ASSET_NAME = "index.android.bundle";
 
     // Singleton instance
     private static UpdateContext sInstance;
@@ -62,8 +55,6 @@ private static native StateCoreResult runStateCore(
         boolean flagB
     );
 
-    private static native String hashBytes(byte[] data);
-
     public UpdateContext(Context context) {
         this.context = context.getApplicationContext();
         this.executor = Executors.newSingleThreadExecutor();
@@ -119,47 +110,6 @@ public boolean getIsUsingBundleUrl() {
         return isUsingBundleUrl;
     }
 
-    public String getBundleHash() {
-        String identity = "embedded:" + getPackageVersion() + ":" + getBuildTime();
-        String cachedIdentity = sp.getString(KEY_BUNDLE_HASH_CACHE_IDENTITY, null);
-        String cachedValue = sp.getString(KEY_BUNDLE_HASH_CACHE_VALUE, null);
-        if (identity.equals(cachedIdentity) && cachedValue != null && !cachedValue.isEmpty()) {
-            return cachedValue;
-        }
-
-        String bundleHash = hashAsset(EMBEDDED_BUNDLE_ASSET_NAME);
-        if (bundleHash == null) {
-            return "";
-        }
-
-        SharedPreferences.Editor editor = sp.edit();
-        editor.putString(KEY_BUNDLE_HASH_CACHE_IDENTITY, identity);
-        editor.putString(KEY_BUNDLE_HASH_CACHE_VALUE, bundleHash);
-        persistEditor(editor, "cache bundle hash");
-        return bundleHash;
-    }
-
-    private String hashAsset(String assetName) {
-        try (InputStream stream = context.getAssets().open(assetName, AssetManager.ACCESS_STREAMING)) {
-            return hashInputStream(stream);
-        } catch (IOException e) {
-            if (DEBUG) {
-                Log.w(TAG, "Failed to hash asset bundle " + assetName, e);
-            }
-            return null;
-        }
-    }
-
-    private String hashInputStream(InputStream stream) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        byte[] buffer = new byte[8192];
-        int read;
-        while ((read = stream.read(buffer)) != -1) {
-            output.write(buffer, 0, read);
-        }
-        return hashBytes(output.toByteArray());
-    }
-
     private void enqueue(DownloadTaskParams params) {
         executor.execute(new DownloadTask(context, params));
     }

android/lib/armeabi-v7a/librnupdate.so

@@ -23,7 +23,6 @@ static Map<String, Object> getConstants(UpdateContext updateContext) {
         constants.put("currentVersion", currentVersion);
         constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
-        constants.put("bundleHash", updateContext.getBundleHash());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
 
         boolean isFirstTime = updateContext.consumeFirstLoadMarker();

android/lib/x86/librnupdate.so

@@ -1,6 +1,5 @@
 #include "../archive_patch_core.h"
 #include "../patch_core.h"
-#include "../sha256_util.h"
 #include "../state_core.h"
 
 #include <cstdio>
@@ -443,15 +442,6 @@ void TestArchivePatchCoreSupportsCustomBundlePatchEntry() {
   ExpectEq(plan.merge_source_subdir, "", "custom bundle patch merge subdir mismatch");
 }
 
-void TestSha256UtilGeneratesStableDigest() {
-  const std::string digest = pushy::crypto::Sha256Hex("abc", 3);
-  ExpectEq(
-      digest,
-      "ba7816bf8f01cfea414140de5dae2223"
-      "b00361a396177a9cb410ff61f20015ad",
-      "sha256 digest mismatch");
-}
-
 }  // namespace
 
 int main() {
@@ -467,7 +457,6 @@ int main() {
       {"ArchivePatchCoreBuildPlanAndCopyGroups", TestArchivePatchCoreBuildPlanAndCopyGroups},
       {"ArchivePatchCoreRejectsMissingEntries", TestArchivePatchCoreRejectsMissingEntries},
       {"ArchivePatchCoreSupportsCustomBundlePatchEntry", TestArchivePatchCoreSupportsCustomBundlePatchEntry},
-      {"Sha256UtilGeneratesStableDigest", TestSha256UtilGeneratesStableDigest},
   };
 
   for (const auto& test : tests) {