Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
e321b25
initial
Lunat1q Jul 31, 2016
9696257
updated submodule
Lunat1q Jul 31, 2016
85fb665
Update README.md
Lunat1q Aug 1, 2016
751dfab
new bot initialization
Lunat1q Aug 1, 2016
9754956
userPanels_Example
Lunat1q Aug 1, 2016
a3c0993
First attempt to make UI work.
Lunat1q Aug 1, 2016
8914b96
updated api to handle proxy
Lunat1q Aug 1, 2016
ab3780a
UI work #2
Lunat1q Aug 1, 2016
ef31493
Assembly better
ActuallyTrent Aug 2, 2016
b67f928
Temporary shit thing for the shitty auto updater until i fixed this shit
Aug 2, 2016
51bcad7
Merge pull request #331 from DurtyFree/master
DurtyFree Aug 2, 2016
77e1726
Optimization to FarmPokestopTask
ActuallyTrent Aug 2, 2016
52cee6f
Location Feeder Protocol updated
5andr0 Aug 2, 2016
cad7a66
API fork updated
Lunat1q Aug 2, 2016
aa92e19
Map working now
Lunat1q Aug 2, 2016
a13b18f
Splitter fix on map window
Lunat1q Aug 2, 2016
8292f3d
Pokestop Discovery changes + Checkbox fix
Lunat1q Aug 2, 2016
c7f180e
#dumb fix
Lunat1q Aug 2, 2016
b63e65e
Force move works now
Lunat1q Aug 2, 2016
a0f1a91
Bot switching fixed + bot Start-Stop fixed.
Lunat1q Aug 2, 2016
c00c552
WildPokemons test
Lunat1q Aug 2, 2016
565ff3c
API Update
Lunat1q Aug 3, 2016
1904517
Merge remote-tracking branch 'refs/remotes/PocketMobsters/master' int…
Lunat1q Aug 3, 2016
a882def
Statistic flow into UI
Lunat1q Aug 3, 2016
2ac9d76
Statistic #2
Lunat1q Aug 3, 2016
b6aab58
logQueue fix
Lunat1q Aug 3, 2016
7880026
ForceMove marker + softban detection
Lunat1q Aug 3, 2016
913c057
Update README.md
Lunat1q Aug 3, 2016
fd400bb
LuredPokemon disappearing
Lunat1q Aug 3, 2016
22648f6
Update README.md
Lunat1q Aug 3, 2016
c97071b
Update README.md
Lunat1q Aug 3, 2016
7f49774
Update README.md
Lunat1q Aug 3, 2016
27765d1
ForceMove pokestop update fixed
Lunat1q Aug 3, 2016
c19e5d3
Release no pdb
Lunat1q Aug 3, 2016
24a1112
Altitude randomizing, some UI Tweaks
Lunat1q Aug 3, 2016
53e902a
SetCoordinates method -> public
Lunat1q Aug 3, 2016
8fd2804
Set starting location by the map
Lunat1q Aug 3, 2016
501374d
Recreating Login instance case of credentials change
Lunat1q Aug 3, 2016
d061bb9
Update README.md
Lunat1q Aug 3, 2016
29c802f
Update README.md
Lunat1q Aug 4, 2016
09ba757
Api update
Lunat1q Aug 8, 2016
27af6e3
With new API
Lunat1q Aug 8, 2016
607dcf0
Merge remote-tracking branch 'origin/Catchem' into Catchem
Lunat1q Aug 8, 2016
e114b63
Merging with latest version + Code cleanup
Lunat1q Aug 8, 2016
5f6d99f
Update README.md
Lunat1q Aug 8, 2016
3ddd1e0
Automatic device info in 1 click via UI
Lunat1q Aug 8, 2016
57bdc2a
Update README.md
Lunat1q Aug 8, 2016
5827b7f
renaming fix
Lunat1q Aug 8, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,5 @@ paket-files/

# JetBrains Rider
.idea/
*.sln.iml
*.sln.iml
*.bak
7 changes: 3 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[submodule "Pokemon-Go-Rocket-API"]
path = Pokemon-Go-Rocket-API
url = https://github.com/DurtyFree/Pokemon-Go-Rocket-API.git
branch = master
[submodule "PokemonGoAPI"]
path = PokemonGoAPI
url = https://github.com/Lunat1q/PokemonGoAPI
81 changes: 81 additions & 0 deletions Catchem/Adb.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
using System;
using System.Diagnostics;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;

namespace Catchem
{
static class Adb
{
public static async Task<DeviceData> GetDeviceData()
{
var dd = new DeviceData();
foreach (var field in typeof(DeviceData).GetFields())
{
var args = field.GetCustomAttribute<AdbArgumentsAttribute>();
if (args == null) continue;
var lcmdInfo1 = new ProcessStartInfo(@"adb\adb.exe")
{
Arguments = args.Arguments,
CreateNoWindow = true,
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false
};
var cmd2 = new Process { StartInfo = lcmdInfo1 };
var output = new StringBuilder();
var error = new StringBuilder();
cmd2.OutputDataReceived += (o, ef) => output.Append(ef.Data);
cmd2.ErrorDataReceived += (o, ef) => error.Append(ef.Data);
cmd2.Start();
cmd2.BeginOutputReadLine();
cmd2.BeginErrorReadLine();
cmd2.WaitForExit();
cmd2.Close();
field.SetValue(dd, output.ToString());
cmd2.Dispose();
await Task.Delay(10);
}
return dd;
}
}

internal class AdbArgumentsAttribute : Attribute
{
public string Arguments;

public AdbArgumentsAttribute(string args)
{
Arguments = args;
}
}

internal class DeviceData
{
[AdbArguments("shell settings get secure android_id")]
public string DeviceId;
[AdbArguments("shell getprop ro.product.board")]
public string AndroidBoardName;
[AdbArguments("shell getprop ro.boot.bootloader")]
public string AndroidBootloader;
[AdbArguments("shell getprop ro.product.brand")]
public string DeviceBrand;
[AdbArguments("shell getprop ro.product.model")]
public string DeviceModel;
[AdbArguments("shell getprop ro.product.name")]
public string DeviceModelIdentifier;
[AdbArguments("shell getprop ro.product.manufacturer")]
public string HardwareManufacturer;
[AdbArguments("shell getprop ro.product.model")]
public string HardwareModel;
[AdbArguments("shell getprop ro.product.name")]
public string FirmwareBrand;
[AdbArguments("shell getprop ro.build.tags")]
public string FirmwareTags;
[AdbArguments("shell getprop ro.build.type")]
public string FirmwareType;
[AdbArguments("shell getprop ro.build.fingerprint")]
public string FirmwareFingerprint;
}
}
23 changes: 23 additions & 0 deletions Catchem/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="PokeBot.GlobalSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="C5" publicKeyToken="282361b99ded7e8e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.4.5947.17248" newVersion="2.4.5947.17248" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
9 changes: 9 additions & 0 deletions Catchem/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Application x:Class="Catchem.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Catchem"
StartupUri="MainWindow.xaml">
<Application.Resources>

</Application.Resources>
</Application>
17 changes: 17 additions & 0 deletions Catchem/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;

namespace Catchem
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}
}
Loading