Merge pull request #5 from wdiasjunior/dev

Release Version 0.6.1

android/app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
           <action android:name="android.intent.action.MAIN" />
           <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
+
         <intent-filter>
           <action android:name="android.intent.action.VIEW" />
           <category android:name="android.intent.category.DEFAULT" />
@@ -37,14 +38,18 @@
         </intent-filter>
 
         <intent-filter>
-          <action android:name="android.intent.action.SEND" />
-          <category android:name="android.intent.category.DEFAULT" />
-          <data android:mimeType="*/*" />
+          <action android:name="android.intent.action.VIEW"/>
+          <category android:name="android.intent.category.DEFAULT"/>
+          <category android:name="android.intent.category.BROWSABLE"/>
+          <data android:scheme="file"/>
+          <data android:scheme="content"/>
+          <data android:mimeType="application/json"/>
         </intent-filter>
+
         <intent-filter>
-          <action android:name="android.intent.action.SEND_MULTIPLE" />
+          <action android:name="android.intent.action.SEND" />
           <category android:name="android.intent.category.DEFAULT" />
-          <data android:mimeType="*/*" />
+          <data android:mimeType="application/json" />
         </intent-filter>
 
       </activity>

android/app/src/main/java/com/barbellwhip/MainActivity.java

@@ -56,11 +56,14 @@ private void handleIntent(Intent intent) {
     if(intent != null) {
       String action = intent.getAction();
       String type = intent.getType();
+      Uri data = intent.getData();
 
-      if (Intent.ACTION_SEND.equals(action) && type != null) {
-        handleSendFile(intent);
-      } else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {
-        handleSendMultipleFiles(intent);
+      if(Intent.ACTION_SEND.equals(action) && type != null) {
+        if("application/json".equals(type)) {
+          handleSendFile(intent);
+        }
+      } else if(Intent.ACTION_VIEW.equals(action) && data != null) {
+        handleViewFile(intent);
       }
     }
   }
@@ -73,16 +76,11 @@ void handleSendFile(Intent intent) {
     }
   }
 
-  void handleSendMultipleFiles(Intent intent) {
-    ArrayList<Uri> fileUris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
-    if(fileUris != null) {
-      ArrayList<String> filePaths = new ArrayList<>();
-      ArrayList<String> fileNames = new ArrayList<>();
-      for(Uri uri : fileUris) {
-        filePaths.add(uri.toString());
-        fileNames.add(getFileName(uri));
-      }
-      sendToReactNative("files", filePaths.toString(), fileNames.toString());
+  void handleViewFile(Intent intent) {
+    Uri fileUri = intent.getData();
+    if(fileUri != null) {
+      String fileName = getFileName(fileUri);
+      sendToReactNative("file", fileUri.toString(), fileName);
     }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "barbellwhip",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

src/TODO.md

@@ -55,9 +55,7 @@
 
 # BUGS
 
-- program page
-  - [ ] "content shift" glitch on first load
-
+- [ ] program page - "content shift" glitch on first load
 - [ ] File system alerts using hard coded messages
 
 ---

src/db/fileSystem/fsWrite.ts

@@ -26,8 +26,9 @@ export const writeToJSON = async (programName: string, programJSON: object) => {
 }
 
 export const importJSON = async (programName: string, programJSON: object, isIntentImport: boolean) => {
+  const _programNameFromJSON = JSON.parse(programJSON).programName;
   try {
-    const availableFileName = await getAvailableFileName(programName);
+    const availableFileName = await getAvailableFileName(_programNameFromJSON);
     const fileUri = `${RNFS.ExternalDirectoryPath}/${availableFileName}`;
     const contents = isIntentImport ? programJSON : JSON.stringify(programJSON, null, 2);
     await RNFS.writeFile(fileUri, contents);

src/pages/AppWrapper.tsx

@@ -31,13 +31,7 @@ const AppWrapper = () => {
 
       async function handleImportFileFromIntent() {
         const fileContents = await readImportedJSON(data);
-        // TODO
-        // properly test if file matches the program schema
-        if(fileName.includes(".json")) {
-          importJSON(fileName, fileContents, true);
-        } else {
-          alert(selectedLocale.fileSystem.invalidFileType);
-        }
+        importJSON(fileName, fileContents, true);
       }
       handleImportFileFromIntent();
     })