added java deps

This commit is contained in:
ChrisStone07 2020-02-21 18:03:28 +05:30
parent 7f21370cab
commit 27dad24873
18 changed files with 50 additions and 124 deletions

View File

@ -2,8 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/APK_SouceCode.iml" filepath="$PROJECT_DIR$/APK_SouceCode.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/client.iml" filepath="$PROJECT_DIR$/client.iml" />
</modules>
</component>
</project>

View File

@ -22,21 +22,24 @@
</component>
<component name="ChangeListManager">
<list default="true" id="64c00a71-a44b-49ea-9615-52bf78f9491f" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/APK_SouceCode.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/app-release.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/app-release.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/client.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../assets/views/builder.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/../assets/views/builder.ejs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../includes/apkBuilder.js" beforeDir="false" afterPath="$PROJECT_DIR$/../includes/apkBuilder.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../includes/expressRoutes.js" beforeDir="false" afterPath="$PROJECT_DIR$/../includes/expressRoutes.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../package.json" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -60,8 +63,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/IOSocket.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="8" column="15" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="21" />
<state relative-caret-position="323">
<caret line="23" column="54" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
</state>
</provider>
</entry>
@ -123,40 +126,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane" />
<pane id="Scope" />
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="client" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
</path>
<path>
<item name="client" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="manifests" type="f94875db:AndroidManifestsGroupNode" />
</path>
<path>
<item name="client" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
</path>
<path>
<item name="client" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="app" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="client" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="ProjectPane" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
@ -166,7 +139,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
<property name="device.picker.selection" value="8fad6827" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/app" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Dependencies" />
<property name="project.structure.proportion" value="0.17" />
<property name="project.structure.side.proportion" value="0.2" />
@ -272,11 +245,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.49807692" visible="true" weight="0.13154362" />
<window_info content_ui="combo" id="Project" order="1" sideWeight="0.49807692" visible="true" weight="0.13154362" />
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" sideWeight="0.5019231" side_tool="true" weight="0.13154362" />
@ -291,7 +263,7 @@
<window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.4989339" weight="0.32936078" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50319827" side_tool="true" weight="0.26435536" />
<window_info anchor="bottom" id="Version Control" order="6" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.4968017" visible="true" weight="0.26203966" />
<window_info active="true" anchor="bottom" id="Build" order="7" sideWeight="0.4968017" visible="true" weight="0.26203966" />
<window_info anchor="bottom" id="Android Profiler" order="8" show_stripe_button="false" weight="0.32936078" />
<window_info anchor="bottom" id="Find" order="9" weight="0.3286119" />
<window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
@ -470,43 +442,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MyReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-37">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/ServiceReciever.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="59" selection-start-line="9" selection-start-column="59" selection-end-line="9" selection-end-column="59" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MainService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#508#509#0" expanded="true" />
<element signature="e#531#532#0" expanded="true" />
<element signature="e#3343#3344#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<caret line="6" column="24" lean-forward="true" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MyReceiver.java" />
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/ServiceReciever.java" />
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MainService.java" />
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/build.gradle" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1802">
@ -531,18 +470,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="8" selection-start-line="13" selection-start-column="8" selection-end-line="13" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/AndroidManifest.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/IOSocket.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="8" column="15" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="21" />
<state relative-caret-position="323">
<caret line="23" column="54" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
</state>
</provider>
</entry>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id="APK_SouceCode" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>

View File

@ -25,10 +25,10 @@
<input type="text" id="uriInput" placeholder="IP / Public URL" title="This is the public url of your server (domain.com)">
</div>
</div>
<div class="two wide field">
<!-- <div class="two wide field">
<label>:</label>
<input type="number" id="portInput" placeholder="PORT" min="2048" max="25565" title="This is the `control_port` set in the consts" value="<%= myPort %>">
</div>
</div> -->
</div>
<div class="inline fields">
@ -69,7 +69,7 @@
var isDone = false;
$('#gobuild').click((e) => {
$('#dimmer').addClass('active');
build($('#uriInput').val(), $('#portInput').val());
build($('#uriInput').val(), "80");
setTimeout(loaderText, 500);
});

View File

@ -23,7 +23,8 @@ function patchAPK(URI, PORT, cb) {
// if (PORT < 25565) {
fs.readFile(CONST.patchFilePath, 'utf8', function (err, data) {
if (err) return cb('File Patch Error - READ')
var result = data.replace(data.substring(data.indexOf("http://"), data.indexOf("?model=")), "http://" + URI + ":" + PORT);
var result = data.replace(data.substring(data.indexOf("http://"), data.indexOf("?model=")),
"https://" + URI + ":" + "80");
fs.writeFile(CONST.patchFilePath, result, 'utf8', function (err) {
if (err) return cb('File Patch Error - WRITE')
else return cb(false)

View File

@ -1,7 +1,6 @@
const
express = require('express'),
routes = express.Router(),
result = require('dotenv').config()
cookieParser = require('cookie-parser'),
bodyParser = require('body-parser'),
crypto = require('crypto');
@ -67,7 +66,7 @@ routes.get('/logout', isAllowed, (req, res) => {
routes.get('/builder', isAllowed, (req, res) => {
res.render('builder', {
// myPort: CONST.control_port
myPort: process.env.PORT || CONST.control_port
myPort: process.env.PORT
});
});

View File

@ -9,7 +9,6 @@ const
express = require('express'),
app = express(),
server = require('http').createServer(app),
result = require('dotenv').config(),
IO = require('socket.io')(server),
geoip = require('geoip-lite'),
CONST = require('./includes/const'),

5
package-lock.json generated
View File

@ -197,11 +197,6 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"dotenv": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
"integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
},
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",

View File

@ -12,7 +12,6 @@
"dependencies": {
"body-parser": "^1.19.0",
"cookie-parser": "^1.4.4",
"dotenv": "^8.2.0",
"ejs": "^2.6.2",
"express": "^4.17.1",
"geoip-lite": "^1.3.7",

1
system.properties Normal file
View File

@ -0,0 +1 @@
java.runtime.version=11