- [Bugfix] for random android version (thx to @aspmaker )

ramtinak · Sep 13, 2018 · bfd5253 · bfd5253
1 parent 4ec0847
commit bfd5253
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Supports: Create new account, verify account, edit profile, set profile picture
 
 | Target | Branch | Version | Download link |
 | ------ | ------ | ------ | ------ |
-| Nuget | master | v1.1.0.2 | [![NuGet](https://img.shields.io/nuget/v/InstagramApiSharp.svg)](https://www.nuget.org/packages/InstagramApiSharp) |
+| Nuget | master | v1.1.0.3 | [![NuGet](https://img.shields.io/nuget/v/InstagramApiSharp.svg)](https://www.nuget.org/packages/InstagramApiSharp) |
 
 
 ## Note
@@ -71,6 +71,9 @@ Task<IResult<object>>
 ```
 
 ## Version changes
+v1.1.0.3
+- [Bugfix] for random android version (thx to [@Aspmaker](https://github.com/aspmaker) )
+
 v1.1.0.2
 - [Add] ShareMediaToThreadAsync to MessagingProcessor
 - [Add] GetFullUserInfoAsync to UserProcessor

diff --git a/src/InstagramApiSharp/API/Processors/HelperProcessor.cs b/src/InstagramApiSharp/API/Processors/HelperProcessor.cs
@@ -301,8 +301,8 @@ private async Task<IResult<bool>> ConfigureVideo(string uploadId, bool isDirectV
                             "device", new JObject{
                                 {"manufacturer", _deviceInfo.HardwareManufacturer},
                                 {"model", _deviceInfo.DeviceModelIdentifier},
-                                {"android_release", _deviceInfo.AndroidVersion.VersionNumber},
-                                {"android_version", _deviceInfo.AndroidVersion.APILevel}
+                                {"android_release", _deviceInfo.AndroidVer.VersionNumber},
+                                {"android_version", _deviceInfo.AndroidVer.APILevel}
                             }
                         },
                         {"length", 0},
@@ -538,8 +538,8 @@ private async Task<IResult<bool>> ConfigurePhoto(string uploadId, bool isDirectP
                             "device", new JObject{
                                 {"manufacturer", _deviceInfo.HardwareManufacturer},
                                 {"model", _deviceInfo.DeviceModelIdentifier},
-                                {"android_release", _deviceInfo.AndroidVersion.VersionNumber},
-                                {"android_version", _deviceInfo.AndroidVersion.APILevel}
+                                {"android_release", _deviceInfo.AndroidVer.VersionNumber},
+                                {"android_version", _deviceInfo.AndroidVer.APILevel}
                             }
                         },
                         {
@@ -720,8 +720,8 @@ private async Task<IResult<InstaMedia>> ConfigureMediaPhotoAsync(string uploadId
                         "device", new JObject{
                             {"manufacturer", _deviceInfo.HardwareManufacturer},
                             {"model", _deviceInfo.DeviceModelIdentifier},
-                            {"android_release", _deviceInfo.AndroidVersion.VersionNumber},
-                            {"android_version", _deviceInfo.AndroidVersion.APILevel}
+                            {"android_release", _deviceInfo.AndroidVer.VersionNumber},
+                            {"android_version", _deviceInfo.AndroidVer.APILevel}
                         }
                     },
                     {
@@ -919,8 +919,8 @@ private async Task<IResult<InstaMedia>> ConfigureIGTVVideo(string uploadId, stri
                         "device", new JObject{
                             {"manufacturer", _deviceInfo.HardwareManufacturer},
                             {"model", _deviceInfo.DeviceModelIdentifier},
-                            {"android_release", _deviceInfo.AndroidVersion.VersionNumber},
-                            {"android_version", _deviceInfo.AndroidVersion.APILevel}
+                            {"android_release", _deviceInfo.AndroidVer.VersionNumber},
+                            {"android_version", _deviceInfo.AndroidVer.APILevel}
                         }
                     },
                     {"length", 0},

diff --git a/src/InstagramApiSharp/API/Processors/MediaProcessor.cs b/src/InstagramApiSharp/API/Processors/MediaProcessor.cs
@@ -567,8 +567,8 @@ private async Task<IResult<InstaMedia>> ConfigureAlbumAsync(string[] imagesUploa
                             "device", JsonConvert.SerializeObject(new JObject{
                                 {"manufacturer", _deviceInfo.HardwareManufacturer},
                                 {"model", _deviceInfo.DeviceModelIdentifier},
-                                {"android_release", _deviceInfo.AndroidVersion.VersionNumber},
-                                {"android_version", _deviceInfo.AndroidVersion.APILevel}
+                                {"android_release", _deviceInfo.AndroidVer.VersionNumber},
+                                {"android_version", _deviceInfo.AndroidVer.APILevel}
                             })
                         },
                         {"length", id.Value.Length},
@@ -591,8 +591,8 @@ private async Task<IResult<InstaMedia>> ConfigureAlbumAsync(string[] imagesUploa
                         {
                             {"manufacturer", _deviceInfo.HardwareManufacturer},
                             {"model", _deviceInfo.DeviceModelIdentifier},
-                            {"android_release", _deviceInfo.AndroidVersion.VersionNumber},
-                            {"android_version", _deviceInfo.AndroidVersion.APILevel}
+                            {"android_release", _deviceInfo.AndroidVer.VersionNumber},
+                            {"android_version", _deviceInfo.AndroidVer.APILevel}
                         }
                     },
                     {"children_metadata", childrenArray},

diff --git a/src/InstagramApiSharp/API/Processors/StoryProcessor.cs b/src/InstagramApiSharp/API/Processors/StoryProcessor.cs
@@ -356,8 +356,8 @@ private async Task<IResult<InstaStoryMedia>> ConfigureStoryVideoAsync(InstaVideo
                         "device", new JObject{
                             {"manufacturer", _deviceInfo.HardwareManufacturer},
                             {"model", _deviceInfo.DeviceModelIdentifier},
-                            {"android_release", _deviceInfo.AndroidVersion.VersionNumber},
-                            {"android_version", _deviceInfo.AndroidVersion.APILevel}
+                            {"android_release", _deviceInfo.AndroidVer.VersionNumber},
+                            {"android_version", _deviceInfo.AndroidVer.APILevel}
                         }
                     },
                     {"length", 0},

diff --git a/src/InstagramApiSharp/Classes/Android/DeviceInfo/AndroidDevice.cs b/src/InstagramApiSharp/Classes/Android/DeviceInfo/AndroidDevice.cs
@@ -10,7 +10,7 @@ public class AndroidDevice
         public Guid GoogleAdId { get; set; } = Guid.NewGuid();
         public Guid RankToken { get; set; } = Guid.NewGuid();
         public Guid AdId { get; set; } = Guid.NewGuid();
-        public AndroidVersion AndroidVersion { get; set; } = AndroidVersion.GetRandomAndriodVersion();
+        public AndroidVersion AndroidVer { get; set; } = AndroidVersion.GetRandomAndriodVersion();
 
         public string AndroidBoardName { get; set; }
         public string AndroidBootloader { get; set; }

diff --git a/src/InstagramApiSharp/Classes/Android/DeviceInfo/AndroidVersion.cs b/src/InstagramApiSharp/Classes/Android/DeviceInfo/AndroidVersion.cs
@@ -117,7 +117,7 @@ public static AndroidVersion FromString(string versionString)
         }
 
         static Random Rnd = new Random();
-        private static AndroidVersion LastAndriodVersion;
+        private static AndroidVersion LastAndriodVersion = AndroidVersions[AndroidVersions.Count - 2];
         public static AndroidVersion GetRandomAndriodVersion()
         {
             TryLabel:
@@ -126,7 +126,8 @@ public static AndroidVersion GetRandomAndriodVersion()
             if (LastAndriodVersion != null)
                 if (androidVersion.APILevel == LastAndriodVersion.APILevel)
                     goto TryLabel;
-            return LastAndriodVersion = androidVersion;
+            LastAndriodVersion = androidVersion;
+            return androidVersion;
         }
         public static AndroidVersion GetAndroidVersion(string apiLevel)
         {

diff --git a/src/InstagramApiSharp/Helpers/ExtensionHelper.cs b/src/InstagramApiSharp/Helpers/ExtensionHelper.cs
@@ -18,8 +18,8 @@ public static string GenerateUserAgent(this AndroidDevice deviceInfo)
                 return InstaApiConstants.USER_AGENT_DEFAULT;
             return string.Format(InstaApiConstants.USER_AGENT, deviceInfo.Dpi, deviceInfo.Resolution, deviceInfo.HardwareManufacturer,
                 deviceInfo.DeviceModelIdentifier, deviceInfo.FirmwareBrand, deviceInfo.HardwareModel,
-                InstaApiConstants.IG_APP_VERSION, deviceInfo.AndroidVersion.APILevel,
-                deviceInfo.AndroidVersion.VersionNumber, InstaApiConstants.IG_APP_API_VERSION);
+                InstaApiConstants.IG_APP_VERSION, deviceInfo.AndroidVer.APILevel,
+                deviceInfo.AndroidVer.VersionNumber, InstaApiConstants.IG_APP_API_VERSION);
         }
         public static string EncodeList(this string[] listOfValues, bool appendQuotation = true)
         {

diff --git a/src/InstagramApiSharp/InstagramApiSharp.csproj b/src/InstagramApiSharp/InstagramApiSharp.csproj
@@ -11,9 +11,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.1.0.2</Version>
-    <AssemblyVersion>1.1.0.2</AssemblyVersion>
-    <FileVersion>1.1.0.2</FileVersion>
+    <Version>1.1.0.3</Version>
+    <AssemblyVersion>1.1.0.3</AssemblyVersion>
+    <FileVersion>1.1.0.3</FileVersion>
     <Description>An complete Private Instagram Api for .NET.
 
 
@@ -36,7 +36,10 @@ See example projects and wiki pages to find out how this library works.</Descrip
     <RepositoryType></RepositoryType>
     <RepositoryUrl>https://github.com/ramtinak/InstagramApiSharp/</RepositoryUrl>
     <PackageProjectUrl>https://github.com/ramtinak/InstagramApiSharp/</PackageProjectUrl>
-    <PackageReleaseNotes>v1.1.0.2
+    <PackageReleaseNotes>v1.1.0.3
+- [Bugfix] for random android version (thx to @aspmaker )
+
+v1.1.0.2
 - [Add] ShareMediaToThreadAsync to MessagingProcessor
 - [Add] GetFullUserInfoAsync to UserProcessor
 - [Add] 1 new device to AndroidDevices