fix us unblock

fix us unblock
This commit is contained in:
hama3254 2020-01-28 18:00:07 +01:00
parent 7c3502aeb0
commit 29fe55aa06
21 changed files with 91 additions and 93 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.zip Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.zip
*.zip

Binary file not shown.

View File

@ -1128,12 +1128,7 @@ Public Class Main
End Sub End Sub
Sub TestOutput(ByVal sender As Object, ByVal e As DataReceivedEventArgs) Sub TestOutput(ByVal sender As Object, ByVal e As DataReceivedEventArgs)
If Thumbnail = Nothing Then Try
Thumbnail = e.Data
Else
Thumbnail = Thumbnail + vbNewLine + e.Data
End If
Dim pr As Process = sender Dim pr As Process = sender
Dim FileNameSplit As String() = pr.StartInfo.Arguments.ToString().Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim FileNameSplit As String() = pr.StartInfo.Arguments.ToString().Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim FileName As String = Chr(34) + FileNameSplit(FileNameSplit.Count - 1) + Chr(34) Dim FileName As String = Chr(34) + FileNameSplit(FileNameSplit.Count - 1) + Chr(34)
@ -1227,6 +1222,9 @@ Public Class Main
Return Nothing Return Nothing
End Function)) End Function))
Catch ex As Exception
End Try
End Sub End Sub

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.2")> <Assembly: AssemblyVersion("3.1.3")>
<Assembly: AssemblyFileVersion("3.1.2")> <Assembly: AssemblyFileVersion("3.1.3")>
<Assembly: NeutralResourcesLanguage("")> <Assembly: NeutralResourcesLanguage("")>

View File

@ -206,16 +206,12 @@ Public Class einstellungen
Main.LoginOnly = "US_UnBlock" Main.LoginOnly = "US_UnBlock"
Dim wb As New WebClient Dim wb As New WebClient
Dim Session As String = wb.DownloadString("https://api1.cr-unblocker.com/getsession.php?version=1.1&device_type=com.crunchyroll.windows.desktop&access_token=LNDJgOit5yaRIWN&device_id=" + GeräteID())
Dim Session As String = wb.DownloadString("http://api-manga.crunchyroll.com/cr_start_session?api_ver=1.0&device_type=com.crunchyroll.windows.desktop&access_token=LNDJgOit5yaRIWN&device_id=" + GeräteID()) 'MsgBox(Session)
If CBool(InStr(Session, "bad_request")) Then If CBool(InStr(Session, "bad_request")) Then
Session = wb.DownloadString("http://api-manga.crunchyroll.com/cr_start_session?api_ver=1.0&device_type=com.crunchyroll.iphone&access_token=QWjz212GspMHH9h&device_id=" + GeräteID()) Session = wb.DownloadString("https://api2.cr-unblocker.com/start_session?version=1.1&device_type=com.crunchyroll.iphone&access_token=QWjz212GspMHH9h&device_id=" + GeräteID())
End If End If
If CBool(InStr(Session, "bad_request")) Then
Session = wb.DownloadString("http://api-manga.crunchyroll.com/cr_start_session?api_ver=1.0&device_type=com.crunchyroll.manga.android&access_token=FLpcfZH4CbW4muO&device_id=" + GeräteID())
End If
If CBool(InStr(Session, "bad_request")) Then If CBool(InStr(Session, "bad_request")) Then
MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly) MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
@ -223,6 +219,9 @@ Public Class einstellungen
ElseIf CBool(InStr(Session, "Unauthenticated request")) Then ElseIf CBool(InStr(Session, "Unauthenticated request")) Then
MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly) MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
Exit Sub Exit Sub
ElseIf CBool(InStr(Session, chr(34) + "country_code" + chr(34) + ":" + chr(34) + "US" + chr(34))) = False Then
MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
Exit Sub
Else Else
'MsgBox(Session) 'MsgBox(Session)
GeckoFX.Show() GeckoFX.Show()