Merge pull request #143 from mockingbot/ios-zip-with-password

can zip with password on iOS, but encryption method option is ignored.

Author: plrthink

README.md

@@ -26,7 +26,7 @@ react-native link react-native-zip-archive
 #### iOS
 
 refer to the [official guide](https://facebook.github.io/react-native/docs/linking-libraries-ios.html),
-remember to also link `libz` to the project.
+remember to also link `libz`, `libiconv` and `Security` to your target.(You can follow the tutorial on [this](http://docs.onemobilesdk.aol.com/ios-ad-sdk/adding-frameworks-xcode.html))
 
 #### Android
 
@@ -167,6 +167,8 @@ zip(sourcePath, targetPath)
 
 > zip source to target
 
+*NOTE: encryptionType is not supported on iOS yet, so it would be igonred on that platform.*
+
 Example
 
 ```js

android/src/main/java/com/rnziparchive/RNZipArchiveModule.java

@@ -343,10 +343,14 @@ public void zip(String fileOrDirectory, String destDirectory, Promise promise) {
 
   @ReactMethod
   public void zipWithPassword(final String fileOrDirectory, final String destDirectory, final String password,
-      final String encyptionMethod, final Promise promise) {
+      final String encryptionMethod, final Promise promise) {
     new Thread(new Runnable() {
       @Override
       public void run() {
+        String _encryptionMethod = encryptionMethod;
+        if (_encryptionMethod == null) {
+          _encryptionMethod = "STANDARD";
+        }
 
         try {
           net.lingala.zip4j.core.ZipFile zipFile = new net.lingala.zip4j.core.ZipFile(destDirectory);
@@ -355,7 +359,7 @@ public void run() {
           parameters.setCompressionMethod(Zip4jConstants.COMP_DEFLATE);
           parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL);
 
-          String encParts[] = encyptionMethod.split("-");
+          String encParts[] = _encryptionMethod.split("-");
 
           if (password != null && !password.isEmpty()) {
             parameters.setEncryptFiles(true);
@@ -368,7 +372,7 @@ public void run() {
               } else {
                 parameters.setAesKeyStrength(Zip4jConstants.ENC_METHOD_STANDARD);
               }
-            } else if (encyptionMethod.equals("STANDARD")) {
+            } else if (_encryptionMethod.equals("STANDARD")) {
               parameters.setEncryptionMethod(Zip4jConstants.ENC_METHOD_STANDARD);
               Log.d(TAG, "Standard Encryption");
             } else {

example/App.js

@@ -10,13 +10,13 @@ import {
   StyleSheet,
   View
 } from 'react-native'
-import UnzipApp from './UnzipApp'
+import Example from './Example'
 
-export default class Example extends Component {
+export default class App extends Component {
   render () {
     return (
       <View style={styles.container}>
-        <UnzipApp />
+        <Example />
       </View>
     )
   }
@@ -29,4 +29,4 @@ const styles = StyleSheet.create({
   }
 })
 
-AppRegistry.registerComponent('example', () => Example)
+AppRegistry.registerComponent('app', () => App)

example/UnzipApp.js example/Example.jsexample/UnzipApp.js renamed to example/Example.js

@@ -10,7 +10,7 @@ import {
 import AwesomeButtonRick from 'react-native-really-awesome-button/src/themes/rick'
 import { DocumentPicker } from 'react-native-document-picker'
 import { copyFile, DocumentDirectoryPath, unlink } from 'react-native-fs'
-import { subscribe, unzip, unzipWithPassword, isPasswordProtected } from 'react-native-zip-archive'
+import { subscribe, unzip, unzipWithPassword, isPasswordProtected, zipWithPassword } from 'react-native-zip-archive'
 
 export default class App extends Component {
   constructor (props) {
@@ -25,7 +25,9 @@ export default class App extends Component {
    * box to download a sample password protected html file
    */
   openLink (isPasswordProtected) {
-    let url = isPasswordProtected ? 'https://app.box.com/s/2szqk4fzsq7brrbcnuk6z2tdl6jq2rts' : 'https://app.box.com/s/ndkn0exa9zmuh9ki7qpjgakvbkrn98q7'
+    const url = isPasswordProtected
+      ? 'https://app.box.com/s/2szqk4fzsq7brrbcnuk6z2tdl6jq2rts'
+      : 'https://app.box.com/s/ndkn0exa9zmuh9ki7qpjgakvbkrn98q7'
     CustomTabs.openURL(url, {
       toolbarColor: '#607D8B',
       enableUrlBarHiding: true,
@@ -45,7 +47,7 @@ export default class App extends Component {
       if (err) {
         console.error(err)
       }
-      var fileDetails = {
+      const fileDetails = {
         uri: response.uri,
         name: response.fileName,
         size: response.fileSize,
@@ -71,19 +73,19 @@ export default class App extends Component {
   }
 
   extractFile () {
-    var fileDetails = this.state.fileDetails
+    const fileDetails = this.state.fileDetails
     if (Object.keys(fileDetails).length === 0) {
       Alert.alert('No file selected!')
       return
     }
 
     // password for the dropbox sample zip file
-    var password = 'helloworld'
+    const password = 'helloworld'
 
-    var filename = fileDetails.name
-    var filePath = DocumentDirectoryPath + '/' + filename
-    var unzipPath = DocumentDirectoryPath
-    unlink(filePath).catch(err => {
+    const filename = fileDetails.name
+    const filePath = DocumentDirectoryPath + '/' + filename
+    const unzipPath = DocumentDirectoryPath
+    return unlink(filePath).catch(err => {
       console.log(err)
       return Promise.resolve()
     }).then(() => {
@@ -99,15 +101,44 @@ export default class App extends Component {
     }).then((response) => {
       console.log('Successfully unzipped files')
       console.log(response)
-      this.setState({
-        ...this.state,
-        uri: `file://${filePath.split('.').slice(0, -1).join('.')}/index.html`
+      return filePath
+    }).catch((err) => {
+      console.log(err)
+    })
+  }
+
+  archiveFolder () {
+    this.extractFile().then((filePath) => {
+      return unlink(filePath).then(() => {
+        // password for the dropbox sample zip file
+        const password = 'helloworld'
+
+        return zipWithPassword(
+          filePath.split('.').slice(0, -1).join('.'),
+          filePath,
+          password
+        ).then((response) => {
+          console.log('Successfully archived the folder')
+          console.log(response)
+        }).catch((err) => {
+          console.log(err)
+        })
+      }).catch((err) => {
+        console.log(err)
       })
     }).catch((err) => {
       console.log(err)
     })
   }
 
+  extractFileAndShow () {
+    this.extractFile().then(filePath => {
+      this.setState({
+        uri: `file://${filePath.split('.').slice(0, -1).join('.')}/index.html`
+      })
+    })
+  }
+
   render () {
     const { uri } = this.state
     if (uri !== '') {
@@ -163,10 +194,21 @@ export default class App extends Component {
           width={300}
           borderRadius={8}
           textSize={22}
-          onPress = {() => this.extractFile()}
+          onPress = {() => this.extractFileAndShow()}
           type="anchor">
             Extract
         </AwesomeButtonRick>
+
+        <View style = {styles.lineStyle} />
+
+        <AwesomeButtonRick
+          width={300}
+          borderRadius={8}
+          textSize={22}
+          onPress = {() => this.archiveFolder()}
+          type="anchor">
+            Archive
+        </AwesomeButtonRick>
       </View>
 
     )

example/scripts/postinstall.js

@@ -1,3 +1,3 @@
-const cp = require('child_process');
-cp.execSync(`rm -rf node_modules/react-native-zip-archive/node_modules`);
-cp.execSync(`rm -rf node_modules/react-native-zip-archive/example `);
+const cp = require('child_process')
+cp.execSync(`rm -rf node_modules/react-native-zip-archive/node_modules`)
+cp.execSync(`rm -rf node_modules/react-native-zip-archive/example `)

index.js

@@ -17,8 +17,8 @@ export const unzipWithPassword = (source, target, password) => {
   return RNZipArchive.unzipWithPassword(source, target, password)
 }
 
-export const zipWithPassword = (source, target, password, encyptionMethod) => {
-  return RNZipArchive.zipWithPassword(source, target, password, encyptionMethod)
+export const zipWithPassword = (source, target, password, encryptionMethod) => {
+  return RNZipArchive.zipWithPassword(source, target, password, encryptionMethod)
 }
 
 export const isPasswordProtected = (source) => {

ios/RNZipArchive.m

@@ -95,6 +95,35 @@ @implementation RNZipArchive
     }
 }
 
+
+RCT_EXPORT_METHOD(zipWithPassword:(NSString *)from
+                  destinationPath:(NSString *)destinationPath
+                  password:(NSString *)password
+                  encryptionType:(NSString *)encryptionType
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    [self zipArchiveProgressEvent:0 total:1 filePath:destinationPath]; // force 0%
+    
+    NSFileManager *fileManager = [[NSFileManager alloc] init];
+    BOOL isDir;
+    BOOL success;
+    [fileManager fileExistsAtPath:from isDirectory:&isDir];
+    if (isDir) {
+        success = [SSZipArchive createZipFileAtPath:destinationPath withContentsOfDirectory:from withPassword:password];
+    } else {
+        success = [SSZipArchive createZipFileAtPath:destinationPath withFilesAtPaths:@[from] withPassword:password];
+    }
+    
+    [self zipArchiveProgressEvent:1 total:1 filePath:destinationPath]; // force 100%
+    
+    if (success) {
+        resolve(destinationPath);
+    } else {
+        NSError *error = nil;
+        reject(@"zip_error", @"unable to zip", error);
+    }
+}
+
 - (dispatch_queue_t)methodQueue {
     return dispatch_queue_create("com.mockingbot.ReactNative.ZipArchiveQueue", DISPATCH_QUEUE_SERIAL);
 }