Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit bc19382

Browse files
BC100DevBC100Dev
committed
Final Commit & Push before Archival
1 parent 391a939 commit bc19382

File tree

7 files changed

+145
-26
lines changed

7 files changed

+145
-26
lines changed

‎AppManifest.xml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<ProjectConfig>
3+
<InfoConfig>
4+
<Name display="Instagram OSINT (Osintgram4j)" name="osintgram4j"/>
5+
<Version ver="0.2" code="1" />
6+
<Maintainers>
7+
<Maintainer>BC100Dev ([email protected])</Maintainer>
8+
</Maintainers>
9+
<Sources type="git" url="https://github.com/BeChris100/osintgram4j" branch="master" />
10+
</InfoConfig>
11+
<Modules>
12+
<Module name="core" executable="true" sources="src/">
13+
<Dependency name="org.json:json" />
14+
<ModLink name="ig_api" />
15+
<ModLink name="commons" />
16+
<ModLink name="mod_api"/>
17+
<Class binName="osintgram4j" main="net.bc100dev.osintgram4j.MainClass" />
18+
<Class binName="og4j-tests" main="net.bc100dev.osintgram4j.test.TestMain" scope="test" />
19+
</Module>
20+
<Module name="ig_api" executable="false" sources="instagram_api/src/">
21+
<Dependency name="org.json:json"/>
22+
<ModLink name="commons" />
23+
</Module>
24+
<Module name="mod_api" executable="false" sources="modapi/src/">
25+
<Dependency name="org.json:json"/>
26+
<ModLink name="commons" />
27+
</Module>
28+
<Module name="commons" executable="false" sources="modapi/src/" />
29+
<Module name="updater" executable="true" sources="updater/src/">
30+
<Class binName="og4j-updater" main="app.updater.UpdaterMain" />
31+
</Module>
32+
</Modules>
33+
</ProjectConfig>

‎README.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ a complete rewrite in Java, bringing back stability, along with new features.
1717

1818
---
1919

20+
## Archival In Progress
21+
Yes, I am planning to archive this project, as soon as
22+
[OsintgramCXX](https://github.com/BeChris100/OsintgramCXX) reaches the same
23+
stability stage as this current project is.
24+
25+
Why am I doing this Archival? Reasons for more performance, and since Java is
26+
slowly becoming a boring language for me, I am fully switching to OsintgramCXX,
27+
making this project an obsolete project, where OsintgramCXX takes over.
28+
29+
---
30+
2031
## Use cases...?
2132
No use cases yet. Matter of fact, this project is still heavily under development.
2233
Keep an eye on the discussions tab, as I will be doing Announcements, when a new
@@ -125,4 +136,4 @@ sources.
125136
---
126137

127138
## Usage
128-
Refer to [the Usage file](docs/Usage) for this project.
139+
Refer to [the Usage file](docs/Usage.md) for this project.

‎extres/coms/devices-ig-private-api.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[
2+
"25/7.1.1; 440dpi; 1080x1920; Xiaomi; Mi Note 3; jason; qcom",
3+
"23/6.0.1; 480dpi; 1080x1920; Xiaomi; Redmi Note 3; kenzo; qcom",
4+
"23/6.0; 480dpi; 1080x1920; Xiaomi; Redmi Note 4; nikel; mt6797",
5+
"24/7.0; 480dpi; 1080x1920; Xiaomi/xiaomi; Redmi Note 4; mido; qcom",
6+
"23/6.0; 480dpi; 1080x1920; Xiaomi; Redmi Note 4X; nikel; mt6797",
7+
"27/8.1.0; 440dpi; 1080x2030; Xiaomi/xiaomi; Redmi Note 5; whyred; qcom",
8+
"23/6.0.1; 480dpi; 1080x1920; Xiaomi; Redmi 4; markw; qcom",
9+
"27/8.1.0; 440dpi; 1080x2030; Xiaomi/xiaomi; Redmi 5 Plus; vince; qcom",
10+
"25/7.1.2; 440dpi; 1080x2030; Xiaomi/xiaomi; Redmi 5 Plus; vince; qcom",
11+
"26/8.0.0; 480dpi; 1080x1920; Xiaomi; MI 5; gemini; qcom",
12+
"27/8.1.0; 480dpi; 1080x1920; Xiaomi/xiaomi; Mi A1; tissot_sprout; qcom",
13+
"26/8.0.0; 480dpi; 1080x1920; Xiaomi; MI 6; sagit; qcom",
14+
"25/7.1.1; 440dpi; 1080x1920; Xiaomi; MI MAX 2; oxygen; qcom",
15+
"24/7.0; 480dpi; 1080x1920; Xiaomi; MI 5s; capricorn; qcom",
16+
"26/8.0.0; 480dpi; 1080x1920; samsung; SM-A520F; a5y17lte; samsungexynos7880",
17+
"26/8.0.0; 480dpi; 1080x2076; samsung; SM-G950F; dreamlte; samsungexynos8895",
18+
"26/8.0.0; 640dpi; 1440x2768; samsung; SM-G950F; dreamlte; samsungexynos8895",
19+
"26/8.0.0; 420dpi; 1080x2094; samsung; SM-G955F; dream2lte; samsungexynos8895",
20+
"26/8.0.0; 560dpi; 1440x2792; samsung; SM-G955F; dream2lte; samsungexynos8895",
21+
"24/7.0; 480dpi; 1080x1920; samsung; SM-A510F; a5xelte; samsungexynos7580",
22+
"26/8.0.0; 480dpi; 1080x1920; samsung; SM-G930F; herolte; samsungexynos8890",
23+
"26/8.0.0; 480dpi; 1080x1920; samsung; SM-G935F; hero2lte; samsungexynos8890",
24+
"26/8.0.0; 420dpi; 1080x2094; samsung; SM-G965F; star2lte; samsungexynos9810",
25+
"26/8.0.0; 480dpi; 1080x2076; samsung; SM-A530F; jackpotlte; samsungexynos7885",
26+
"24/7.0; 640dpi; 1440x2560; samsung; SM-G925F; zerolte; samsungexynos7420",
27+
"26/8.0.0; 420dpi; 1080x1920; samsung; SM-A720F; a7y17lte; samsungexynos7880",
28+
"24/7.0; 640dpi; 1440x2560; samsung; SM-G920F; zeroflte; samsungexynos7420",
29+
"24/7.0; 420dpi; 1080x1920; samsung; SM-J730FM; j7y17lte; samsungexynos7870",
30+
"26/8.0.0; 480dpi; 1080x2076; samsung; SM-G960F; starlte; samsungexynos9810",
31+
"26/8.0.0; 420dpi; 1080x2094; samsung; SM-N950F; greatlte; samsungexynos8895",
32+
"26/8.0.0; 420dpi; 1080x2094; samsung; SM-A730F; jackpot2lte; samsungexynos7885",
33+
"26/8.0.0; 420dpi; 1080x2094; samsung; SM-A605FN; a6plte; qcom",
34+
"26/8.0.0; 480dpi; 1080x1920; HUAWEI/HONOR; STF-L09; HWSTF; hi3660",
35+
"27/8.1.0; 480dpi; 1080x2280; HUAWEI/HONOR; COL-L29; HWCOL; kirin970",
36+
"26/8.0.0; 480dpi; 1080x2032; HUAWEI/HONOR; LLD-L31; HWLLD-H; hi6250",
37+
"26/8.0.0; 480dpi; 1080x2150; HUAWEI; ANE-LX1; HWANE; hi6250",
38+
"26/8.0.0; 480dpi; 1080x2032; HUAWEI; FIG-LX1; HWFIG-H; hi6250",
39+
"27/8.1.0; 480dpi; 1080x2150; HUAWEI/HONOR; COL-L29; HWCOL; kirin970",
40+
"26/8.0.0; 480dpi; 1080x2038; HUAWEI/HONOR; BND-L21; HWBND-H; hi6250",
41+
"23/6.0.1; 420dpi; 1080x1920; LeMobile/LeEco; Le X527; le_s2_ww; qcom"
42+
]

‎instagram_api/src/com/instagram/api/user/UserManager.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ public static User login(String username, String password) throws IOException, A
6565
throw new APIException(ex);
6666
}
6767

68-
Map<String, String> loginHeaders = new HashMap<>();
69-
loginHeaders.putAll(Constants.putDefaultHeaders());
70-
loginHeaders.put("enc_password", PasswordEncryption.)
68+
Map<String, String> loginHeaders = new HashMap<>(Constants.putDefaultHeaders());
69+
loginHeaders.put("enc_password", PasswordEncryption.writePassword(encPass));
7170

7271
//https://www.instagram.com/api/v1/accounts/login/ajax
7372
//https://www.instagram.com/api/v1/accounts/login/ajax?force_classic_login

‎src/net/bc100dev/osintgram4j/dev/DeviceClient.java

+23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,27 @@
11
package net.bc100dev.osintgram4j.dev;
22

3+
import org.json.JSONObject;
4+
35
public class DeviceClient {
6+
7+
public static DeviceClient fromJson(Platform platform, AppType appType, JSONObject clientApp) {
8+
return null;
9+
}
10+
11+
public enum Platform {
12+
13+
MOBILE,
14+
15+
DESKTOP
16+
17+
}
18+
19+
public enum AppType {
20+
21+
APP,
22+
23+
BROWSER
24+
25+
}
26+
427
}

‎src/net/bc100dev/osintgram4j/dev/DeviceOSInfo.java

+7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
package net.bc100dev.osintgram4j.dev;
22

3+
import org.json.JSONObject;
4+
35
public class DeviceOSInfo {
6+
7+
public static DeviceOSInfo fromJson(JSONObject jsonRoot) {
8+
return null;
9+
}
10+
411
}

‎src/net/bc100dev/osintgram4j/dev/PhoneDevice.java

+26-22
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,40 @@ public class PhoneDevice extends Device {
66

77
/*
88
{
9-
"manufacturer": "Google",
10-
"model": "Pixel 8 Pro",
11-
"android": true,
12-
"ios": false,
13-
"client_type": "App",
14-
"client_app": {
15-
"application_version": ""
16-
},
17-
"client_browser": {
18-
"browser": "",
19-
"browser_version": ""
20-
},
21-
"android_values": {
22-
"version": 14,
23-
"kernel_version": "5.15.131-android14-gd99d9fe08e0c-ab11209359",
24-
"build_number": "AP1A.240405.002",
25-
"serial": "35625PCEF6166R"
26-
},
27-
"ios_values": {}
28-
}
9+
"manufacturer": "Google",
10+
"model": "Pixel 8 Pro",
11+
"android": true,
12+
"ios": false,
13+
"client_type": "App",
14+
"client_app": {
15+
"application_version": ""
16+
},
17+
"client_browser": {
18+
"browser": "",
19+
"browser_version": ""
20+
},
21+
"android_values": {
22+
"version": 14,
23+
"kernel_version": "5.15.131-android14-gd99d9fe08e0c-ab11209359",
24+
"build_number": "AP1A.240405.002",
25+
"serial": "35625PCEF6166R"
26+
},
27+
"ios_values": {}
28+
}
2929
*/
30+
3031
public static PhoneDevice fromJson(JSONObject json) {
3132
String manu = json.getString("manufacturer");
3233
String model = json.getString("model");
33-
DeviceClient appClient = DeviceClient.asApp().fromJson(json.getJSONObject("client_app"));
34-
DeviceClient browserClient = DeviceClient.asBrowser().fromJson(json.getJSONObject("client_browser"));
34+
DeviceClient appClient = DeviceClient.fromJson(DeviceClient.Platform.MOBILE, DeviceClient.AppType.APP, json.getJSONObject("client_app"));
35+
DeviceClient browserClient = DeviceClient.fromJson(DeviceClient.Platform.MOBILE, DeviceClient.AppType.BROWSER, json.getJSONObject("client_browser"));
3536
DeviceOSInfo devOsInfo = DeviceOSInfo.fromJson(json.getString("os").equalsIgnoreCase("android") ?
3637
json.getJSONObject("android_values") : (json.getString("os").equalsIgnoreCase("ios") ?
3738
json.getJSONObject("ios_values") : null));
3839

40+
if (devOsInfo == null)
41+
throw new NullPointerException("Initiated a Null Pointer Reference while fetching Device Information");
42+
3943
DeviceClient client = json.getString("client_type").equals("App") ? appClient : browserClient;
4044

4145
return new PhoneDevice(manu, model, client, devOsInfo);

0 commit comments

Comments
 (0)