From c5af7aeee62d2154b3d9629ca7c420540ff593ce Mon Sep 17 00:00:00 2001 From: simbadMarino Date: Wed, 6 Apr 2022 19:21:07 -0500 Subject: [PATCH] - SWAP service implemented as part of the Wallet manager (dev fee: 3.3 BTT per swap) - Wallet GUI improved a bit - Settings GUI improved a bit - Added future features as hints in the GUI (BackUp Node Data, Data encryption, Auto renew storage contracts) - Added the "Experimental" notice in the dBrowse tab to warn users on its usage, please remember the file list could be lost after a phone reset. --- App.js | 615 ++++++++++++++---- .../arm64-v8a/json_generation_record.json | 79 --- .../armeabi-v7a/json_generation_record.json | 79 --- .../x86/json_generation_record.json | 79 --- .../updatedDebug/x86_64/build_model.json | 140 ---- .../x86_64/json_generation_record.json | 79 --- android/app/build.gradle | 4 +- .../arm64-v8a/json_generation_record.json | 79 --- .../armeabi-v7a/json_generation_record.json | 79 --- .../debug/x86/json_generation_record.json | 79 --- .../ndkBuild/debug/x86_64/build_model.json | 140 ---- .../debug/x86_64/json_generation_record.json | 79 --- components/filePicker.js | 65 +- package.json | 2 + 14 files changed, 513 insertions(+), 1085 deletions(-) delete mode 100644 android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a/json_generation_record.json delete mode 100644 android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a/json_generation_record.json delete mode 100644 android/app/.cxx/ndkBuild/updatedDebug/x86/json_generation_record.json delete mode 100644 android/app/.cxx/ndkBuild/updatedDebug/x86_64/build_model.json delete mode 100644 android/app/.cxx/ndkBuild/updatedDebug/x86_64/json_generation_record.json delete mode 100644 android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a/json_generation_record.json delete mode 100644 android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a/json_generation_record.json delete mode 100644 android/terminal-emulator/.cxx/ndkBuild/debug/x86/json_generation_record.json delete mode 100644 android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/build_model.json delete mode 100644 android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/json_generation_record.json diff --git a/App.js b/App.js index e0a946d..f6a04de 100755 --- a/App.js +++ b/App.js @@ -9,7 +9,7 @@ import { DarkTheme, } from '@react-navigation/native'; import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; -import { Icon, Input, Card } from 'react-native-elements'; +import { Icon, Input, Card, Divider} from 'react-native-elements'; import FilePicker from "./components/filePicker.js"; import LoginScreen from "./components/Login.js"; import Terminal from "./components/terminal.js"; @@ -23,7 +23,9 @@ import AsyncStorage from '@react-native-async-storage/async-storage'; import Clipboard from '@react-native-clipboard/clipboard'; import { RootSiblingParent } from 'react-native-root-siblings'; import Toast from 'react-native-root-toast'; +import {Picker} from '@react-native-picker/picker'; //import Toast from "./components/Toast.js"; +const BigNumber = require('bignumber.js'); // ----------------------------- START OF MODULE VARS --------------------------------------// @@ -35,12 +37,15 @@ var btfsVersion = ""; var systemCurrentDate = ""; var BTFSNodeID = ""; var walletPassword = ""; -var amountToDeposit = ""; +var amountToDeposit = 0; var float_bttBalance = 0; var float_WBTT_Balance = 0; var float_Vault_WBTT_Balance = 0; var strBTTCAddress = " "; var strVaultAddress = " "; +var strCoinSwap = ""; +var globalSwapQty = 0; +var amountDevFee = 7770000000000000000; //Configurable dev Fee // ----------------------------- END OF MODULE VARS --------------------------------------// @@ -67,7 +72,7 @@ try{ .then(function (privateKey) { var str_PrivateKey = privateKey.data.wallet_import_prv_key; console.log(str_PrivateKey); - Alert.alert("PK Backup ", str_PrivateKey); + Alert.alert("BTTC Private Key: ", str_PrivateKey); }) } catch (err) { @@ -75,6 +80,12 @@ catch (err) { } } +function backUpNode(){ + + Alert.alert("BackUp to be implemented soon :)") + +} + function getMnemonic(){ try{ var mnemonic = axios.post('http://localhost:5001/api/v1/wallet/keys?') @@ -96,40 +107,27 @@ catch (err) { -function setWalletPassword(){ - - var passwordSetResp = axios.post('http://localhost:5001/api/v1/wallet/password?arg='+ walletPassword) - .then(function (passwordSetResp) { - var str_passwordFeedback = passwordSetResp.data.Message; - console.log(str_passwordFeedback); - alert(str_passwordFeedback); - }) - .catch(function(error) { - console.log('There has been a problem with your fetch operation: ' + error.message); - Alert.alert("Error", "Password already set, use cli to change it if needed"); - // ADD THIS THROW error - //throw error; - }); - } - -function depositBTT(){ +function wbtt2wbttvault(){ try{ +var oneBTT = new BigNumber(amountToDeposit); +oneBTT = oneBTT.shiftedBy(18); +oneBTT = oneBTT.toFixed(); - var depositBTT_resp = axios.post('http://localhost:5001/api/v1/vault/deposit?arg=' + amountToDeposit*1000000000000000000 ) + var depositBTT_resp = axios.post('http://localhost:5001/api/v1/vault/deposit?arg=' + oneBTT ) .then(function (depositBTT_resp) { var str_depositMessage = depositBTT_resp.data.hash; console.log(str_depositMessage); - Alert.alert("Deposit Success!, Hash", str_depositMessage); + Alert.alert("Swap Done!, Hash", str_depositMessage); }) .catch(function(error) { console.log('There has been a problem with your fetch operation: ' + error.message); //Alert.alert("Error", "Password already set, use cli to change it if needed"); console.log("Call response: " + JSON.stringify(depositBTT_resp)); - Alert.alert("Deposit Error", "Max WBTT deposit balance exceeded, try depositing less WBTT (No more than 1000)"); + Alert.alert("Swap Error", "Not enough WBTT balance u.u "); }); } @@ -143,23 +141,90 @@ try{ } +function btt2wbtt(){ -function withdrawBTT(WBTTamount){ +try{ +var oneBTT = new BigNumber(amountToDeposit); +oneBTT = oneBTT.shiftedBy(18); +oneBTT = oneBTT.toFixed(); + +var swappedBTT = axios.post('http://localhost:5001/api/v1/bttc/btt2wbtt?arg=' + oneBTT ) + .then(function (swappedBTT) { + var str_Message = swappedBTT.data.hash; + console.log(str_Message); + Alert.alert("Swap Done!, Hash", str_Message); + }) + + .catch(function(error) { + console.log('There has been a problem with your fetch operation: ' + error.message); + //Alert.alert("Error", "Password already set, use cli to change it if needed"); + console.log("Call response: " + JSON.stringify(swappedBTT)); + Alert.alert("Swap Error", "Not enough WBTT balance u.u "); + }); + +} + +catch (err) { + + throw err; + + } + + +} + +function wbtt2btt(){ try{ +var oneBTT = new BigNumber(amountToDeposit); +oneBTT = oneBTT.shiftedBy(18); +oneBTT = oneBTT.toFixed(); + +var swappedBTT = axios.post('http://localhost:5001/api/v1/bttc/wbtt2btt?arg=' + oneBTT ) + .then(function (swappedBTT) { + var str_Message = swappedBTT.data.hash; + console.log(str_Message); + Alert.alert("Swap Done!, Hash", str_Message); + }) + + .catch(function(error) { + console.log('There has been a problem with your fetch operation: ' + error.message); + //Alert.alert("Error", "Password already set, use cli to change it if needed"); + console.log("Call response: " + JSON.stringify(swappedBTT)); + Alert.alert("Swap Error", "Not enough WBTT balance u.u "); + }); + +} + +catch (err) { + + throw err; + + } + + +} - var withdrawBTT_resp = axios.post('http://localhost:5001/api/v1/vault/withdraw?arg=' + WBTTamount*1000000000000000000 ) - .then(function (withdrawBTT_resp) { - var str_withdrawMessage = withdrawBTT_resp.data.hash; - console.log(withdrawBTT_resp); - console.log(str_withdrawMessage); - Alert.alert("Withdrawal Success!, Hash", str_withdrawMessage); + +function wbttvault2wbtt(){ + +try{ +var oneBTT = new BigNumber(amountToDeposit); +oneBTT = oneBTT.shiftedBy(18); +oneBTT = oneBTT.toFixed(); + + var swappedBTT = axios.post('http://localhost:5001/api/v1/vault/withdraw?arg=' + oneBTT ) + .then(function (swappedBTT) { + var str_Message = swappedBTT.data.hash; + console.log(swappedBTT); + console.log(str_Message); + Alert.alert("Withdrawal Success!, Hash", str_Message); }) .catch(function(error) { console.log('There has been a problem with your fetch operation: ' + error.message); //Alert.alert("Error", "Password already set, use cli to change it if needed"); - console.log("Call response: " + JSON.stringify(withdrawBTT_resp.data)); + console.log("Call response: " + JSON.stringify(swappedBTT.data)); Alert.alert("Withdraw Error", "Please make sure to leave at least some WBTT in vault"); }); @@ -219,32 +284,149 @@ function getConfig() { -function depositToBTFS() { +function swapWBTTtoWBTTVault() { + + +Alert.alert( + "Confirming Swap... \n(" + strCoinSwap + ")" , + "Are you sure?", + [ + // The "Yes" button + { + text: "Yes", + onPress: () => { + amountToDeposit = globalSwapQty; + wbtt2wbttvault(); + }, + }, + // The "No" button + // Does nothing but dismiss the dialog when tapped + { + text: "No", + }, + ] + ); +} + +function swapWBTTVaultToWBTT() { + + +Alert.alert( + "Confirming Swap... \n(" + strCoinSwap + ")" , + "Are you sure?", + [ + // The "Yes" button + { + text: "Yes", + onPress: () => { + amountToDeposit = globalSwapQty; + wbttvault2wbtt(); + }, + }, + // The "No" button + // Does nothing but dismiss the dialog when tapped + { + text: "No", + }, + ] + ); +} + +function swapBTTtoWBTT() { -prompt( - 'Deposit WBTT', - 'From BTTC to Vault', - [ - {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'}, - {text: 'OK', onPress: WBTTamount => { - console.log('OK Pressed, WBTT amount: ' + WBTTamount); - amountToDeposit = WBTTamount; - console.log(amountToDeposit); - depositBTT(); - } - }, - ], - { - type: 'number', - cancelable: false, - defaultValue: '', - placeholder: 'Deposit Amount' - } -); +Alert.alert( + "Confirming Swap... \n(" + strCoinSwap + ")" , + "Are you sure?", + [ + // The "Yes" button + { + text: "Yes", + onPress: () => { + amountToDeposit = globalSwapQty; + btt2wbtt(); + }, + }, + // The "No" button + // Does nothing but dismiss the dialog when tapped + { + text: "No", + }, + ] + ); +} +function swapWBTTtoBTT() { +Alert.alert( + "Confirming Swap... \n(" + strCoinSwap + ")" , + "Are you sure?", + [ + // The "Yes" button + { + text: "Yes", + onPress: () => { + amountToDeposit = globalSwapQty; + wbtt2btt(); + }, + }, + // The "No" button + // Does nothing but dismiss the dialog when tapped + { + text: "No", + }, + ] + ); +} + + + +async function processSwap(swapOption){ + +console.log(swapOption); +console.log(globalSwapQty); + +switch(swapOption) +{ + + case 1: + console.log("From BTT to WBTT"); + strCoinSwap = "BTT to WBTT"; + swapBTTtoWBTT(); + sendDevFee(3.33); + break; + case 2: + console.log("From WBTT to BTT"); + strCoinSwap = "WBTT to BTT"; + swapWBTTtoBTT(); + sendDevFee(3.33); + break; + case 3: + console.log("From WBTT to WBTT(Vault)"); + strCoinSwap = "WBTT to WBTT(Vault)"; + swapWBTTtoWBTTVault(); + sendDevFee(3.33); + break; + case 4: + console.log("From WBTT(Vault) to WBTT"); + strCoinSwap = "WBTT(Vault) to WBTT"; + swapWBTTVaultToWBTT(); + sendDevFee(3.33); + break; + + default: + console.log("Error, no selection"); + strCoinSwap = "BTT to WBTT"; + break; +} + +} + +function updateTokenValue(e){ + +console.log(e); + } function withdrawToBTTC() { @@ -328,30 +510,26 @@ async function getTronAddress() { -async function sendDevTipMainNetBTT(){ - -try{ - //POST - var sendDevTip_resp = axios.post("http://localhost:5001/api/v1/wallet/transfer?arg=TU6fRT8ooBK9reAvuetxqpsykHekANmE2H&arg=100000&p=password" ) - .then(function (sendDevTip_resp) { - - // float_btfsBalance = walletBalance.data.BtfsWalletBalance; - //float_bttBalance = walletBalance.data.BttWalletBalance; - console.log(sendDevTip_resp); - //console.log("BTT balance: " + float_bttBalance); - }) - - } - - catch (err) { - - throw err; - - } +function sendDevFee(fee){ +var devFee = new BigNumber(fee); +devFee = devFee.shiftedBy(18); +devFee = devFee.toFixed(); +var sendDevTip_resp = axios.post("http://localhost:5001/api/v1/bttc/send-btt-to?arg=0x346c8074649C844D5c98AF7D4757B85a6bD72679&arg=" + devFee ) + .then(function (sendDevTip_resp) { + console.log(sendDevTip_resp); + }) + .catch(function(error) { + console.log(sendDevTip_resp); + console.log('There has been a problem with your fetch operation: ' + error.message); + console.log("BTFS daemon not running in background...") + // Add a Toast on screen. + Toast.show('dCloud could not send dev fee, but thats ok =)', {duration: Toast.durations.LONG,position: -50}); + }); } + async function getBalanceBTT(){ @@ -367,7 +545,7 @@ async function getBalanceBTT(){ //Alert.alert("Error", "Password already set, use cli to change it if needed"); console.log("BTFS daemon not running in background...") // Add a Toast on screen. - Toast.show('dCloud failed to connect to BTFS... Please make sure daemon is running from the terminal', {duration: Toast.durations.LONG,}); + Toast.show('dCloud failed to connect to BTFS... Please make sure daemon is running from the terminal', {duration: Toast.durations.LONG, position:50}); //ToastAndroid.show("dCloud failed to connect to BTFS...", ToastAndroid.SHORT); // ADD THIS THROW error //throw error; @@ -475,7 +653,8 @@ function TerminalScreen() { function WalletScreen() { - +const [selectedSwap, setSelectedSwap] = useState(1); +const [number, setNumber] = React.useState(null); const [copiedText, setCopiedText] = useState(''); const [refreshing, setRefreshing] = React.useState(false); const [bttBalance] = useState(1); @@ -498,6 +677,11 @@ const copyToClipboard = () => { Clipboard.setString(strBTTCAddress); }; +const onChangeNumber = (value) => { + globalSwapQty = value; +}; + + @@ -528,44 +712,74 @@ const onRefresh = React.useCallback(() => { } > - - BTTC Address + + + + BTTC Address + + + {strBTTCAddress} Balance: {cardBalance[0].balance} {cardBalance[0].title} {cardBalance[1].balance} {cardBalance[1].title} Vault Address - {strVaultAddress} Balance: {cardBalance[2].balance} {cardBalance[2].title} - + + + Tokens Swap + + + onChangeNumber(value)} + value={number} + /> + + setSelectedSwap(itemValue) + }> + + + + + + + + SWAP + + + + - - - Copy BTTC Address - - - - Deposit WBTT to Vault - - - - Withdraw WBTT - @@ -625,7 +839,8 @@ function dWebScreen() { function SettingsScreen() { - + const [isEnabled, setIsEnabled] = useState(false) + const toggleSwitch = () => setIsEnabled(previousState => !previousState); const titleText = "BTFS node Configuration"; const nodeModeText = "Node Mode"; @@ -658,29 +873,115 @@ const getData = async () => { return ( - - - {titleText} - - - - - - Get BTFS Data - - - - + + + + {"Node Settings"} + + + + + Host Mode + + + + - - Get PrivateKey - - - - + Renter Mode + + + + + + Auto renew contracts + + + + + + Data Encryption + + + + + + + + + Get Node Info + + + + + Get PrivateKey + + + + + BackUp Node Data + + + + @@ -743,6 +1044,7 @@ state = { + render() { @@ -766,8 +1068,8 @@ state = { else if (route.name === 'Settings') { iconName = focused ? 'settings' : 'settings'; } - else if (route.name === 'Files') { - iconName = focused ? 'storage' : 'storage'; + else if (route.name === 'dBrowse') { + iconName = focused ? 'folder' : 'folder'; } else if (route.name === 'Terminal') { iconName = focused ? 'code' : 'code'; @@ -783,15 +1085,15 @@ state = { }, })} tabBarOptions={{ - activeTintColor: 'white', + activeTintColor: '#6495ed', inactiveTintColor: 'gray', }} > - + + - @@ -861,6 +1163,17 @@ tabsButton:{ marginBottom:10 }, + nodeButton:{ + width:"50%", + backgroundColor:"#6495ed", + borderRadius:15, + height:40, + alignItems:"center", + justifyContent:"center", + marginTop:10, + marginBottom:10 + }, + copyButton:{ width:"50%", backgroundColor:"#6495ed", @@ -887,6 +1200,11 @@ tabsButton:{ margin: 1 }, + nodeSettingText: { + fontSize: 15, + color: 'white' + }, + cardMainNetText: { fontSize: 15, color: '#B6B6B2', @@ -896,18 +1214,45 @@ tabsButton:{ cardRenter: { display: "flex", - height: 220, + height: 210, //flexDirection: "column", - backgroundColor: '#2f2c2c', - borderColor: 'gray', - borderRadius: 5, - borderTopColor: 'gray', - borderTopWidth: 5 + backgroundColor: '#292929', + borderColor: 'white', + borderRadius: 25, + borderTopColor: 'white', + borderTopWidth: 0, + borderLeftWidth: 0, + borderRightWidth: 0, + borderBottomWidth: 0 }, + cardSwap: { + display: "flex", + height: 220, + //flexDirection: "column", + backgroundColor: '#292929', + borderRadius: 25, + borderTopColor: 'white', + borderTopWidth: 0, + borderLeftWidth: 0, + borderRightWidth: 0, + borderBottomWidth: 0 + }, + cardNode: { + display: "flex", + height: 380, + //flexDirection: "column", + backgroundColor: '#292929', + borderRadius: 25, + borderTopColor: 'white', + borderTopWidth: 0, + borderLeftWidth: 0, + borderRightWidth: 0, + borderBottomWidth: 0 + }, scrollView: { flex: 1, alignItems: 'center', - justifyContent: 'space-evenly' + justifyContent: 'flex-start' } }); diff --git a/android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a/json_generation_record.json b/android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a/json_generation_record.json deleted file mode 100644 index d6f84eb..0000000 --- a/android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: arm64-v8a", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003darm64-v8a\nNDK_ALL_ABIS\u003darm64-v8a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003darm64-v8a\nNDK_ALL_ABIS\u003darm64-v8a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/arm64-v8a/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a/json_generation_record.json b/android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a/json_generation_record.json deleted file mode 100644 index dfd465a..0000000 --- a/android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: armeabi-v7a", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/armeabi-v7a/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/android/app/.cxx/ndkBuild/updatedDebug/x86/json_generation_record.json b/android/app/.cxx/ndkBuild/updatedDebug/x86/json_generation_record.json deleted file mode 100644 index e594df9..0000000 --- a/android/app/.cxx/ndkBuild/updatedDebug/x86/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: x86", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003dx86\nNDK_ALL_ABIS\u003dx86\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003dx86\nNDK_ALL_ABIS\u003dx86\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/android/app/.cxx/ndkBuild/updatedDebug/x86_64/build_model.json b/android/app/.cxx/ndkBuild/updatedDebug/x86_64/build_model.json deleted file mode 100644 index f9e61c5..0000000 --- a/android/app/.cxx/ndkBuild/updatedDebug/x86_64/build_model.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "abi": "X86_64", - "info": { - "abi": "X86_64", - "bitness": 64, - "deprecated": false, - "default": true - }, - "originalCxxBuildFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86_64", - "cxxBuildFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86_64", - "abiPlatformVersion": 24, - "variant": { - "buildSystemArgumentList": [], - "cFlagsList": [ - "-std\u003dc11", - "-Wall", - "-Wextra", - "-Werror", - "-Os", - "-fno-stack-protector", - "-Wl,--gc-sections" - ], - "cppFlagsList": [], - "variantName": "updatedDebug", - "objFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj/local", - "soFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib", - "isDebuggableEnabled": true, - "validAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "buildTargetSet": [], - "implicitBuildTargetSet": [], - "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", - "module": { - "cxxFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx", - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates", - "gradleModulePathName": ":app", - "moduleRootFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app", - "moduleBuildFile": "/home/simbad/Documents/Git_Repos/dCloud/android/app/build.gradle", - "makeFile": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "buildSystem": "NDK_BUILD", - "ndkFolder": "/home/simbad/Android/Sdk/ndk/21.1.6352462", - "ndkVersion": "21.1.6352462", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkDefaultAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkDefaultStl": "SYSTEM", - "ndkMetaPlatforms": { - "min": 16, - "max": 29, - "aliases": { - "20": 19, - "25": 24, - "J": 16, - "J-MR1": 17, - "J-MR2": 18, - "K": 19, - "L": 21, - "L-MR1": 22, - "M": 23, - "N": 24, - "N-MR1": 24, - "O": 26, - "O-MR1": 27, - "P": 28, - "Q": 29 - } - }, - "ndkMetaAbiList": [ - { - "abi": "ARMEABI_V7A", - "bitness": 32, - "deprecated": false, - "default": true - }, - { - "abi": "ARM64_V8A", - "bitness": 64, - "deprecated": false, - "default": true - }, - { - "abi": "X86", - "bitness": 32, - "deprecated": false, - "default": true - }, - { - "abi": "X86_64", - "bitness": 64, - "deprecated": false, - "default": true - } - ], - "originalCmakeToolchainFile": "/home/simbad/Android/Sdk/ndk/21.1.6352462/build/cmake/android.toolchain.cmake", - "cmakeToolchainFile": "/home/simbad/Android/Sdk/ndk/21.1.6352462/build/cmake/android.toolchain.cmake", - "stlSharedObjectMap": { - "LIBCXX_SHARED": { - "ARMEABI_V7A": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", - "ARM64_V8A": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", - "X86": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", - "X86_64": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" - }, - "LIBCXX_STATIC": {}, - "NONE": {}, - "SYSTEM": {} - }, - "project": { - "rootBuildGradleFolder": "/home/simbad/Documents/Git_Repos/dCloud/android", - "cxxFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/.cxx", - "compilerSettingsCacheFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/.cxx", - "sdkFolder": "/home/simbad/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "isCmakeBuildCohabitationEnabled": false, - "isPrefabEnabled": false, - "isV2NativeModelEnabled": true - }, - "nativeBuildOutputLevel": "QUIET" - }, - "prefabDirectory": "/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/prefab" - }, - "buildSettings": { - "environmentVariables": [] - }, - "prefabFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/prefab/x86_64" -} \ No newline at end of file diff --git a/android/app/.cxx/ndkBuild/updatedDebug/x86_64/json_generation_record.json b/android/app/.cxx/ndkBuild/updatedDebug/x86_64/json_generation_record.json deleted file mode 100644 index 54a893c..0000000 --- a/android/app/.cxx/ndkBuild/updatedDebug/x86_64/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: x86_64", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86_64/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86_64\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86_64\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003dx86_64\nNDK_ALL_ABIS\u003dx86_64\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk\nAPP_ABI\u003dx86_64\nNDK_ALL_ABIS\u003dx86_64\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/app/build/intermediates/ndkBuild/updatedDebug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/app/.cxx/ndkBuild/updatedDebug/x86_64/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/app/src/main/cpp/Android.mk", - "tag": "updatedDebug|x86_64", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index caf7608..c99a49e 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -165,8 +165,8 @@ android { defaultConfig { applicationId "com.justshare" minSdkVersion project.properties.minSdkVersion.toInteger() - versionCode 14 - versionName "1.3.0" + versionCode 15 + versionName "1.3.1" manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux" manifestPlaceholders.TERMUX_APP_NAME = "justshare" diff --git a/android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a/json_generation_record.json b/android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a/json_generation_record.json deleted file mode 100644 index 076cfc8..0000000 --- a/android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: arm64-v8a", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003darm64-v8a\nNDK_ALL_ABIS\u003darm64-v8a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003darm64-v8a\nNDK_ALL_ABIS\u003darm64-v8a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/arm64-v8a/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|arm64-v8a", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a/json_generation_record.json b/android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a/json_generation_record.json deleted file mode 100644 index 0bfae59..0000000 --- a/android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: armeabi-v7a", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/armeabi-v7a/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|armeabi-v7a", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/android/terminal-emulator/.cxx/ndkBuild/debug/x86/json_generation_record.json b/android/terminal-emulator/.cxx/ndkBuild/debug/x86/json_generation_record.json deleted file mode 100644 index e81d9fa..0000000 --- a/android/terminal-emulator/.cxx/ndkBuild/debug/x86/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: x86", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003dx86\nNDK_ALL_ABIS\u003dx86\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003dx86\nNDK_ALL_ABIS\u003dx86\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/build_model.json b/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/build_model.json deleted file mode 100644 index 28c9669..0000000 --- a/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/build_model.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "abi": "X86_64", - "info": { - "abi": "X86_64", - "bitness": 64, - "deprecated": false, - "default": true - }, - "originalCxxBuildFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64", - "cxxBuildFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64", - "abiPlatformVersion": 24, - "variant": { - "buildSystemArgumentList": [], - "cFlagsList": [ - "-std\u003dc11", - "-Wall", - "-Wextra", - "-Werror", - "-Os", - "-fno-stack-protector", - "-Wl,--gc-sections" - ], - "cppFlagsList": [], - "variantName": "debug", - "objFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj/local", - "soFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib", - "isDebuggableEnabled": true, - "validAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "buildTargetSet": [], - "implicitBuildTargetSet": [], - "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", - "module": { - "cxxFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx", - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates", - "gradleModulePathName": ":terminal-emulator", - "moduleRootFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator", - "moduleBuildFile": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build.gradle", - "makeFile": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "buildSystem": "NDK_BUILD", - "ndkFolder": "/home/simbad/Android/Sdk/ndk/21.1.6352462", - "ndkVersion": "21.1.6352462", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkDefaultAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" - ], - "ndkDefaultStl": "SYSTEM", - "ndkMetaPlatforms": { - "min": 16, - "max": 29, - "aliases": { - "20": 19, - "25": 24, - "J": 16, - "J-MR1": 17, - "J-MR2": 18, - "K": 19, - "L": 21, - "L-MR1": 22, - "M": 23, - "N": 24, - "N-MR1": 24, - "O": 26, - "O-MR1": 27, - "P": 28, - "Q": 29 - } - }, - "ndkMetaAbiList": [ - { - "abi": "ARMEABI_V7A", - "bitness": 32, - "deprecated": false, - "default": true - }, - { - "abi": "ARM64_V8A", - "bitness": 64, - "deprecated": false, - "default": true - }, - { - "abi": "X86", - "bitness": 32, - "deprecated": false, - "default": true - }, - { - "abi": "X86_64", - "bitness": 64, - "deprecated": false, - "default": true - } - ], - "originalCmakeToolchainFile": "/home/simbad/Android/Sdk/ndk/21.1.6352462/build/cmake/android.toolchain.cmake", - "cmakeToolchainFile": "/home/simbad/Android/Sdk/ndk/21.1.6352462/build/cmake/android.toolchain.cmake", - "stlSharedObjectMap": { - "LIBCXX_SHARED": { - "ARMEABI_V7A": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", - "ARM64_V8A": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", - "X86": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", - "X86_64": "/home/simbad/Android/Sdk/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" - }, - "LIBCXX_STATIC": {}, - "NONE": {}, - "SYSTEM": {} - }, - "project": { - "rootBuildGradleFolder": "/home/simbad/Documents/Git_Repos/dCloud/android", - "cxxFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/.cxx", - "compilerSettingsCacheFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/.cxx", - "sdkFolder": "/home/simbad/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "isCmakeBuildCohabitationEnabled": false, - "isPrefabEnabled": false, - "isV2NativeModelEnabled": true - }, - "nativeBuildOutputLevel": "QUIET" - }, - "prefabDirectory": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/prefab" - }, - "buildSettings": { - "environmentVariables": [] - }, - "prefabFolder": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/prefab/x86_64" -} \ No newline at end of file diff --git a/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/json_generation_record.json b/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/json_generation_record.json deleted file mode 100644 index 13d1b89..0000000 --- a/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/json_generation_record.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - { - "level": "INFO", - "message": "Start JSON generation. Platform version: 24 min SDK version: x86_64", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "rebuilding JSON /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/android_gradle_build.json due to:", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "- command changed from previous, will remove stale json folder", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "removing stale contents from \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "created folder \u0027/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64\u0027", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "executing ndkBuild Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003dx86_64\nNDK_ALL_ABIS\u003dx86_64\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "Executable : /home/simbad/Android/Sdk/ndk/21.1.6352462/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk\nAPP_ABI\u003dx86_64\nNDK_ALL_ABIS\u003dx86_64\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-24\nNDK_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/build/intermediates/ndkBuild/debug/lib\nAPP_CFLAGS+\u003d-std\u003dc11\nAPP_CFLAGS+\u003d-Wall\nAPP_CFLAGS+\u003d-Wextra\nAPP_CFLAGS+\u003d-Werror\nAPP_CFLAGS+\u003d-Os\nAPP_CFLAGS+\u003d-fno-stack-protector\nAPP_CFLAGS+\u003d-Wl,--gc-sections\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "parse and convert ndk-build output to build configuration JSON", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "done executing ndkBuild", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "write command file /home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/.cxx/ndkBuild/debug/x86_64/build_command.txt", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - }, - { - "level": "INFO", - "message": "JSON generation completed without problems", - "file": "/home/simbad/Documents/Git_Repos/dCloud/android/terminal-emulator/src/main/jni/Android.mk", - "tag": "debug|x86_64", - "diagnosticCode": "UNKNOWN" - } -] \ No newline at end of file diff --git a/components/filePicker.js b/components/filePicker.js index 6f27013..5071d93 100755 --- a/components/filePicker.js +++ b/components/filePicker.js @@ -1,7 +1,7 @@ import React from 'react'; import { useState } from 'react'; import Swipeable from 'react-native-swipeable'; -import { StyleSheet, Text, View, TouchableOpacity, Button, Image, Alert, SafeAreaView, ScrollView, ToastAndroid, Share, Linking, TouchableHighlight } from 'react-native'; +import { StyleSheet, Text, View, TouchableOpacity, Button, Image, Alert, SafeAreaView, ScrollView, Share, Linking, TouchableHighlight } from 'react-native'; import {ProgressBar} from '@react-native-community/progress-bar-android'; //import { Overlay } from 'react-native-elements'; import DocumentPicker from 'react-native-document-picker'; @@ -16,7 +16,8 @@ import Popup from './Popup'; import AsyncStorage from '@react-native-async-storage/async-storage'; import Clipboard from '@react-native-clipboard/clipboard'; import { AnimatedCircularProgress } from 'react-native-circular-progress'; - +const BigNumber = require('bignumber.js'); +import Toast from 'react-native-root-toast'; //import { filelist } from "./fileList.js"; import { @@ -37,39 +38,9 @@ var timeOutWatchDogCounter = 0; var results_multi ={}; var files_list = []; - -/* -var files_list_ = [ - { - title: 'Test', - icon: 'check-circle', - subtitle: '22.8MB 12 Oct 2021', - qmhash: 'Qmhash' - } -];*/ -/*{ - title: 'File1', - icon: 'check-circle', - subtitle: '2.5MB 20 Oct 2021' -}, -{ - title: 'File2', - icon: 'sync', - subtitle: '22.8MB 12 Oct 2021' -}, -{ - title: 'File3', - icon: 'sync', - subtitle: '100.5MB 23 Oct 2021' -} - -]; */ //Initialize list of files for the browse section const MAX_UPLOAD_TIMEOUT = 500; - - - var myVar1; var myVar2; var myVar3; @@ -142,6 +113,25 @@ const backUpJSON = async () => { } +function sendDevFee(fee){ +var devFee = new BigNumber(fee); +devFee = devFee.shiftedBy(18); +devFee = devFee.toFixed(); + +var sendDevTip_resp = axios.post("http://localhost:5001/api/v1/bttc/send-btt-to?arg=0x346c8074649C844D5c98AF7D4757B85a6bD72679&arg=" + devFee ) + .then(function (sendDevTip_resp) { + + console.log(sendDevTip_resp); + }) + .catch(function(error) { + console.log(sendDevTip_resp); + console.log('There has been a problem with your fetch operation: ' + error.message); + console.log("BTFS daemon not running in background...") + // Add a Toast on screen. + Toast.show('dCloud could not send dev fee, but thats ok =)', {duration: Toast.durations.LONG,position: -50}); + }); +} + const getMultiUploadStatus = async(item) => { @@ -315,6 +305,7 @@ state = { try { //myVar7 = setInterval(this.updateFilesList,1000); + sendDevFee(5.55); currentSessionIDMessage = ""; results_multi = await DocumentPicker.pickMultiple({ type: [DocumentPicker.types.allFiles], @@ -392,7 +383,8 @@ state = { const copyToClipboardLong = (i) => { Clipboard.setString("https://gateway.btfs.io/btfs/" + files_list[i].qmhash); console.log("Long ṕress done on item : " + files_list[i].qmhash); - ToastAndroid.show("Link Copied to Clipboard", ToastAndroid.SHORT); + Toast.show("Link Copied to Clipboard", {duration: Toast.durations.SHORT,position: -50}); + //ToastAndroid.show("Link Copied to Clipboard", ToastAndroid.SHORT); }; const onShare = async () => { try { @@ -460,10 +452,10 @@ files_list.splice(item,1); - - + + dBrowse - + Experimental @@ -590,6 +582,7 @@ uploadStsText: { fileTabTitleText: { fontSize: 30, + fontWeight: "bold", color: 'white' diff --git a/package.json b/package.json index 804c865..3f3a4fe 100755 --- a/package.json +++ b/package.json @@ -14,9 +14,11 @@ "@react-native-clipboard/clipboard": "^1.8.4", "@react-native-community/masked-view": "^0.1.10", "@react-native-community/progress-bar-android": "^1.0.4", + "@react-native-picker/picker": "^2.4.0", "@react-navigation/bottom-tabs": "^5.11.3", "@react-navigation/native": "^5.9.0", "axios": "^0.21.1", + "bignumber.js": "^9.0.2", "core": "unimodules/core", "form-data": "^3.0.0", "popup-ui": "^1.2.2",