You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-12-08 23:07:32 +02:00
Compare commits
8 Commits
test-binar
...
android-sy
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ce097957aa | ||
|
|
d4731d1c4a | ||
|
|
3669a1b5d6 | ||
|
|
b93f9aaf01 | ||
|
|
8679290206 | ||
|
|
4acec5c6c7 | ||
|
|
f1b03453a4 | ||
|
|
7972dd5556 |
30
.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch
Normal file
30
.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
|
||||||
|
index a8abd71833879201e3438b2fa51d712a311c4551..ffe9c2c6dfa5c703ba76b65d94d5dd6784102c19 100644
|
||||||
|
--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
|
||||||
|
+++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
|
||||||
|
@@ -591,7 +591,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
|
||||||
|
// ignored.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
- RNFetchBlobFileResp rnFetchBlobFileResp = (RNFetchBlobFileResp) responseBody;
|
||||||
|
+ RNFetchBlobFileResp rnFetchBlobFileResp = new RNFetchBlobFileResp(responseBody);
|
||||||
|
|
||||||
|
if(rnFetchBlobFileResp != null && !rnFetchBlobFileResp.isDownloadComplete()){
|
||||||
|
callback.invoke("Download interrupted.", null);
|
||||||
|
diff --git a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
|
||||||
|
index 2470eef612308c15a89dfea5a1f16937469be29f..965f8becc195965907699182c764ec9e51811450 100644
|
||||||
|
--- a/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
|
||||||
|
+++ b/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
|
||||||
|
@@ -35,6 +35,12 @@ public class RNFetchBlobFileResp extends ResponseBody {
|
||||||
|
FileOutputStream ofStream;
|
||||||
|
boolean isEndMarkerReceived;
|
||||||
|
|
||||||
|
+ // ref: https://github.com/joltup/rn-fetch-blob/issues/490#issuecomment-990899440
|
||||||
|
+ public RNFetchBlobFileResp(ResponseBody body) {
|
||||||
|
+ super();
|
||||||
|
+ this.originalBody = body;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public RNFetchBlobFileResp(ReactApplicationContext ctx, String taskId, ResponseBody body, String path, boolean overwrite) throws IOException {
|
||||||
|
super();
|
||||||
|
this.rctContext = ctx;
|
||||||
@@ -95,6 +95,7 @@
|
|||||||
},
|
},
|
||||||
"packageManager": "yarn@3.3.1",
|
"packageManager": "yarn@3.3.1",
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch"
|
"react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
|
||||||
|
"rn-fetch-blob@0.12.0": "patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
"react-native-image-picker": "5.3.1",
|
"react-native-image-picker": "5.3.1",
|
||||||
"react-native-image-resizer": "1.4.5",
|
"react-native-image-resizer": "1.4.5",
|
||||||
"react-native-modal-datetime-picker": "14.0.1",
|
"react-native-modal-datetime-picker": "14.0.1",
|
||||||
"react-native-paper": "5.5.0",
|
"react-native-paper": "5.5.2",
|
||||||
"react-native-popup-menu": "0.16.1",
|
"react-native-popup-menu": "0.16.1",
|
||||||
"react-native-quick-actions": "0.3.13",
|
"react-native-quick-actions": "0.3.13",
|
||||||
"react-native-rsa-native": "2.0.5",
|
"react-native-rsa-native": "2.0.5",
|
||||||
|
|||||||
@@ -439,6 +439,14 @@
|
|||||||
"created_at": "2023-04-10T02:33:42Z",
|
"created_at": "2023-04-10T02:33:42Z",
|
||||||
"repoId": 79162682,
|
"repoId": 79162682,
|
||||||
"pullRequestNo": 8036
|
"pullRequestNo": 8036
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "simonla",
|
||||||
|
"id": 14934570,
|
||||||
|
"comment_id": 1503950257,
|
||||||
|
"created_at": "2023-04-11T19:02:23Z",
|
||||||
|
"repoId": 79162682,
|
||||||
|
"pullRequestNo": 8042
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -741,7 +741,7 @@ The following commands are available in [command-line mode](#command-line-mode):
|
|||||||
|
|
||||||
# License
|
# License
|
||||||
|
|
||||||
Copyright (c) 2016-2021 Laurent Cozic
|
Copyright (c) 2016-2023 Laurent Cozic
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
|||||||
20
yarn.lock
20
yarn.lock
@@ -4978,7 +4978,7 @@ __metadata:
|
|||||||
react-native-image-picker: 5.3.1
|
react-native-image-picker: 5.3.1
|
||||||
react-native-image-resizer: 1.4.5
|
react-native-image-resizer: 1.4.5
|
||||||
react-native-modal-datetime-picker: 14.0.1
|
react-native-modal-datetime-picker: 14.0.1
|
||||||
react-native-paper: 5.5.0
|
react-native-paper: 5.5.2
|
||||||
react-native-popup-menu: 0.16.1
|
react-native-popup-menu: 0.16.1
|
||||||
react-native-quick-actions: 0.3.13
|
react-native-quick-actions: 0.3.13
|
||||||
react-native-rsa-native: 2.0.5
|
react-native-rsa-native: 2.0.5
|
||||||
@@ -27441,9 +27441,9 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"react-native-paper@npm:5.5.0":
|
"react-native-paper@npm:5.5.2":
|
||||||
version: 5.5.0
|
version: 5.5.2
|
||||||
resolution: "react-native-paper@npm:5.5.0"
|
resolution: "react-native-paper@npm:5.5.2"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@callstack/react-theme-provider": ^3.0.8
|
"@callstack/react-theme-provider": ^3.0.8
|
||||||
color: ^3.1.2
|
color: ^3.1.2
|
||||||
@@ -27453,7 +27453,7 @@ __metadata:
|
|||||||
react-native: "*"
|
react-native: "*"
|
||||||
react-native-safe-area-context: "*"
|
react-native-safe-area-context: "*"
|
||||||
react-native-vector-icons: "*"
|
react-native-vector-icons: "*"
|
||||||
checksum: 1d433e5d48462a8a6477d979f7c9ae44278dfaf713d5f57ff218cfbd8d6f6556d42ace6d01cce410a922157242bd61f92bdf87e0cbd84c6231f1ab369af1777b
|
checksum: fd87b64409e51a2a8c64019710c79c17d6dd016ea3744d869e9aa6a891093418ca6a2326f8ab063ef460d781459b8ed676952a030e64acf8312bc4d05a4c50eb
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -28790,6 +28790,16 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
"rn-fetch-blob@patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch::locator=root%40workspace%3A.":
|
||||||
|
version: 0.12.0
|
||||||
|
resolution: "rn-fetch-blob@patch:rn-fetch-blob@npm%3A0.12.0#./.yarn/patches/rn-fetch-blob-npm-0.12.0-cf02e3c544.patch::version=0.12.0&hash=9431c2&locator=root%40workspace%3A."
|
||||||
|
dependencies:
|
||||||
|
base-64: 0.1.0
|
||||||
|
glob: 7.0.6
|
||||||
|
checksum: 6535ee347b3e76733a10c3873c14622b35613caa86242536b68f130b75a3379d9bb060ad5c8832d78e639c88869e321c288e5c8e89373cdb0c14f23253c31c50
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"roarr@npm:^2.15.3":
|
"roarr@npm:^2.15.3":
|
||||||
version: 2.15.4
|
version: 2.15.4
|
||||||
resolution: "roarr@npm:2.15.4"
|
resolution: "roarr@npm:2.15.4"
|
||||||
|
|||||||
Reference in New Issue
Block a user