develop #10

Merged
s426229 merged 80 commits from develop into master 2021-01-27 18:32:19 +01:00
3 changed files with 2 additions and 6 deletions
Showing only changes of commit e4114ae7e6 - Show all commits

View File

@ -35,7 +35,6 @@ namespace Klient.Droid
var Login = FindViewById<EditText>(Resource.Id.Login).Text; var Login = FindViewById<EditText>(Resource.Id.Login).Text;
SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.Password).Text).SecurePassword; SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.Password).Text).SecurePassword;
if (Login.Length < 3 || Login.Length > 12) if (Login.Length < 3 || Login.Length > 12)
{ {
SetContentView(Resource.Layout.ekranLogowania); SetContentView(Resource.Layout.ekranLogowania);

View File

@ -3,5 +3,5 @@
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" /> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application android:label="Klient.Android" /> <application android:label="Klient.Android" android:usesCleartextTraffic="true" />
</manifest> </manifest>

View File

@ -15094,10 +15094,7 @@ namespace Klient.Droid
{ {
// aapt resource value: 0x7F100000 // aapt resource value: 0x7F100000
public const int network_security_config = 2131755008; public const int xamarin_essentials_fileprovider_file_paths = 2131755008;
// aapt resource value: 0x7F100001
public const int xamarin_essentials_fileprovider_file_paths = 2131755009;
static Xml() static Xml()
{ {