mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-29 12:32:21 -05:00
fixed keechallenge issues
This commit is contained in:
parent
147c0e19b6
commit
7ef5a8336a
@ -2,7 +2,7 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// Dieser Code wurde von einem Tool generiert.
|
// Dieser Code wurde von einem Tool generiert.
|
||||||
// Laufzeitversion:4.0.30319.34011
|
// Laufzeitversion:4.0.30319.34014
|
||||||
//
|
//
|
||||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||||
// der Code erneut generiert wird.
|
// der Code erneut generiert wird.
|
||||||
|
@ -124,7 +124,7 @@ namespace keepass2android
|
|||||||
private bool _starting;
|
private bool _starting;
|
||||||
private OtpInfo _otpInfo;
|
private OtpInfo _otpInfo;
|
||||||
private ChallengeInfo _chalInfo;
|
private ChallengeInfo _chalInfo;
|
||||||
private byte[] _challengeResponse;
|
private byte[] _challengeSecret;
|
||||||
private readonly int[] _otpTextViewIds = new[] {Resource.Id.otp1, Resource.Id.otp2, Resource.Id.otp3, Resource.Id.otp4, Resource.Id.otp5, Resource.Id.otp6};
|
private readonly int[] _otpTextViewIds = new[] {Resource.Id.otp1, Resource.Id.otp2, Resource.Id.otp3, Resource.Id.otp4, Resource.Id.otp5, Resource.Id.otp6};
|
||||||
private const string OtpInfoKey = "OtpInfoKey";
|
private const string OtpInfoKey = "OtpInfoKey";
|
||||||
private const string EnteredOtpsKey = "EnteredOtpsKey";
|
private const string EnteredOtpsKey = "EnteredOtpsKey";
|
||||||
@ -284,7 +284,49 @@ namespace keepass2android
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (requestCode == RequestCodeChallengeYubikey && resultCode == Result.Ok) _challengeResponse = data.GetByteArrayExtra("response");
|
if (requestCode == RequestCodeChallengeYubikey && resultCode == Result.Ok)
|
||||||
|
{
|
||||||
|
byte[] challengeResponse = data.GetByteArrayExtra("response");
|
||||||
|
_challengeSecret = KeeChallengeProv.GetSecret(_chalInfo, challengeResponse);
|
||||||
|
UpdateOkButtonState();
|
||||||
|
if (_challengeSecret != null)
|
||||||
|
{
|
||||||
|
new LoadingDialog<object, object, object>(this, true,
|
||||||
|
//doInBackground
|
||||||
|
delegate
|
||||||
|
{
|
||||||
|
//save aux file
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ChallengeInfo temp = KeeChallengeProv.Encrypt(_challengeSecret);
|
||||||
|
IFileStorage fileStorage = App.Kp2a.GetOtpAuxFileStorage(_ioConnection);
|
||||||
|
IOConnectionInfo iocAux = fileStorage.GetFilePath(fileStorage.GetParentPath(_ioConnection),
|
||||||
|
fileStorage.GetFilenameWithoutPathAndExt(_ioConnection) + ".xml");
|
||||||
|
if (!temp.Save(iocAux))
|
||||||
|
{
|
||||||
|
Toast.MakeText(this, Resource.String.ErrorUpdatingChalAuxFile, ToastLength.Long).Show();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Array.Clear(challengeResponse, 0, challengeResponse.Length);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Kp2aLog.Log(e.ToString());
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
, delegate
|
||||||
|
{
|
||||||
|
|
||||||
|
}).Execute();
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Toast.MakeText(this, Resource.String.bad_resp, ToastLength.Long).Show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -754,7 +796,7 @@ namespace keepass2android
|
|||||||
FindViewById(Resource.Id.pass_ok).Enabled = FindViewById<EditText>(Resource.Id.pass_otpsecret).Text != "" && _password != "";
|
FindViewById(Resource.Id.pass_ok).Enabled = FindViewById<EditText>(Resource.Id.pass_otpsecret).Text != "" && _password != "";
|
||||||
break;
|
break;
|
||||||
case KeyProviders.Chal:
|
case KeyProviders.Chal:
|
||||||
FindViewById(Resource.Id.pass_ok).Enabled = true;
|
FindViewById(Resource.Id.pass_ok).Enabled = _challengeSecret != null;
|
||||||
break;
|
break;
|
||||||
case KeyProviders.ChalRecovery:
|
case KeyProviders.ChalRecovery:
|
||||||
FindViewById(Resource.Id.pass_ok).Enabled = true;
|
FindViewById(Resource.Id.pass_ok).Enabled = true;
|
||||||
@ -784,6 +826,7 @@ namespace keepass2android
|
|||||||
if (KeyProviderType == KeyProviders.Chal)
|
if (KeyProviderType == KeyProviders.Chal)
|
||||||
{
|
{
|
||||||
FindViewById (Resource.Id.otpView).Visibility = ViewStates.Visible;
|
FindViewById (Resource.Id.otpView).Visibility = ViewStates.Visible;
|
||||||
|
FindViewById(Resource.Id.otps_pending).Visibility = ViewStates.Gone;
|
||||||
}
|
}
|
||||||
UpdateOkButtonState();
|
UpdateOkButtonState();
|
||||||
}
|
}
|
||||||
@ -842,26 +885,8 @@ namespace keepass2android
|
|||||||
}
|
}
|
||||||
else if (KeyProviderType == KeyProviders.Chal)
|
else if (KeyProviderType == KeyProviders.Chal)
|
||||||
{
|
{
|
||||||
byte[] secret = KeeChallenge.KeeChallengeProv.GetSecret(_chalInfo, _challengeResponse);
|
compositeKey.AddUserKey(new KcpCustomKey(KeeChallengeProv.Name, _challengeSecret, true));
|
||||||
if (secret != null)
|
|
||||||
{
|
|
||||||
compositeKey.AddUserKey(new KcpCustomKey(KeeChallengeProv.Name, secret, true));
|
|
||||||
ChallengeInfo temp = KeeChallengeProv.Encrypt(secret);
|
|
||||||
IFileStorage fileStorage = App.Kp2a.GetOtpAuxFileStorage(_ioConnection);
|
|
||||||
IOConnectionInfo iocAux = fileStorage.GetFilePath(fileStorage.GetParentPath(_ioConnection),
|
|
||||||
fileStorage.GetFilenameWithoutPathAndExt(_ioConnection) + ".xml");
|
|
||||||
if(!temp.Save(iocAux))
|
|
||||||
{
|
|
||||||
Toast.MakeText(this, Resource.String.ErrorUpdatingChalAuxFile, ToastLength.Long).Show();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Array.Clear(secret, 0, secret.Length);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Toast.MakeText(this, Resource.String.bad_resp, ToastLength.Long).Show();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckBox cbQuickUnlock = (CheckBox) FindViewById(Resource.Id.enable_quickunlock);
|
CheckBox cbQuickUnlock = (CheckBox) FindViewById(Resource.Id.enable_quickunlock);
|
||||||
@ -1230,12 +1255,8 @@ namespace keepass2android
|
|||||||
{
|
{
|
||||||
if ( Success )
|
if ( Success )
|
||||||
{
|
{
|
||||||
_act.SetEditText(Resource.Id.password, "");
|
|
||||||
_act.SetEditText(Resource.Id.pass_otpsecret, "");
|
_act.ClearEnteredPassword();
|
||||||
foreach (int otpId in _act._otpTextViewIds)
|
|
||||||
{
|
|
||||||
_act.SetEditText(otpId, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
_act.LaunchNextActivity();
|
_act.LaunchNextActivity();
|
||||||
|
|
||||||
@ -1249,6 +1270,18 @@ namespace keepass2android
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ClearEnteredPassword()
|
||||||
|
{
|
||||||
|
SetEditText(Resource.Id.password, "");
|
||||||
|
SetEditText(Resource.Id.pass_otpsecret, "");
|
||||||
|
foreach (int otpId in _otpTextViewIds)
|
||||||
|
{
|
||||||
|
SetEditText(otpId, "");
|
||||||
|
}
|
||||||
|
Array.Clear(_challengeSecret, 0, _challengeSecret.Length);
|
||||||
|
_challengeSecret = null;
|
||||||
|
}
|
||||||
|
|
||||||
class SaveOtpAuxFileAndLoadDb : LoadDb
|
class SaveOtpAuxFileAndLoadDb : LoadDb
|
||||||
{
|
{
|
||||||
private readonly PasswordActivity _act;
|
private readonly PasswordActivity _act;
|
||||||
|
289
src/keepass2android/Resources/Resource.designer.cs
generated
289
src/keepass2android/Resources/Resource.designer.cs
generated
@ -2,7 +2,7 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// Dieser Code wurde von einem Tool generiert.
|
// Dieser Code wurde von einem Tool generiert.
|
||||||
// Laufzeitversion:4.0.30319.34011
|
// Laufzeitversion:4.0.30319.34014
|
||||||
//
|
//
|
||||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||||
// der Code erneut generiert wird.
|
// der Code erneut generiert wird.
|
||||||
@ -2057,433 +2057,430 @@ namespace keepass2android
|
|||||||
public const int ic_launcher_gray = 2130837820;
|
public const int ic_launcher_gray = 2130837820;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02013d
|
// aapt resource value: 0x7f02013d
|
||||||
public const int ic_launcher_gray_bday = 2130837821;
|
public const int ic_launcher_offline = 2130837821;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02013e
|
// aapt resource value: 0x7f02013e
|
||||||
public const int ic_launcher_offline = 2130837822;
|
public const int ic_launcher_red = 2130837822;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02013f
|
// aapt resource value: 0x7f02013f
|
||||||
public const int ic_launcher_red = 2130837823;
|
public const int ic_menu_add_field_holo_light = 2130837823;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020140
|
// aapt resource value: 0x7f020140
|
||||||
public const int ic_menu_add_field_holo_light = 2130837824;
|
public const int ic_menu_add_field_holodark = 2130837824;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020141
|
// aapt resource value: 0x7f020141
|
||||||
public const int ic_menu_add_field_holodark = 2130837825;
|
public const int ic_menu_remove_field_holo_light = 2130837825;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020142
|
// aapt resource value: 0x7f020142
|
||||||
public const int ic_menu_remove_field_holo_light = 2130837826;
|
public const int ic_menu_remove_field_holodark = 2130837826;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020143
|
// aapt resource value: 0x7f020143
|
||||||
public const int ic_menu_remove_field_holodark = 2130837827;
|
public const int ic_menu_view = 2130837827;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020144
|
// aapt resource value: 0x7f020144
|
||||||
public const int ic_menu_view = 2130837828;
|
public const int ic_mic_dialog = 2130837828;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020145
|
// aapt resource value: 0x7f020145
|
||||||
public const int ic_mic_dialog = 2130837829;
|
public const int ic_storage_androidget = 2130837829;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020146
|
// aapt resource value: 0x7f020146
|
||||||
public const int ic_storage_androidget = 2130837830;
|
public const int ic_storage_androidsend = 2130837830;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020147
|
// aapt resource value: 0x7f020147
|
||||||
public const int ic_storage_androidsend = 2130837831;
|
public const int ic_storage_dropbox = 2130837831;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020148
|
// aapt resource value: 0x7f020148
|
||||||
public const int ic_storage_dropbox = 2130837832;
|
public const int ic_storage_dropboxKP2A = 2130837832;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020149
|
// aapt resource value: 0x7f020149
|
||||||
public const int ic_storage_dropboxKP2A = 2130837833;
|
public const int ic_storage_file = 2130837833;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02014a
|
// aapt resource value: 0x7f02014a
|
||||||
public const int ic_storage_file = 2130837834;
|
public const int ic_storage_ftp = 2130837834;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02014b
|
// aapt resource value: 0x7f02014b
|
||||||
public const int ic_storage_ftp = 2130837835;
|
public const int ic_storage_gdrive = 2130837835;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02014c
|
// aapt resource value: 0x7f02014c
|
||||||
public const int ic_storage_gdrive = 2130837836;
|
public const int ic_storage_http = 2130837836;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02014d
|
// aapt resource value: 0x7f02014d
|
||||||
public const int ic_storage_http = 2130837837;
|
public const int ic_storage_https = 2130837837;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02014e
|
// aapt resource value: 0x7f02014e
|
||||||
public const int ic_storage_https = 2130837838;
|
public const int ic_storage_sftp = 2130837838;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02014f
|
// aapt resource value: 0x7f02014f
|
||||||
public const int ic_storage_sftp = 2130837839;
|
public const int ic_storage_skydrive = 2130837839;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020150
|
// aapt resource value: 0x7f020150
|
||||||
public const int ic_storage_skydrive = 2130837840;
|
public const int ic_subtype_keyboard = 2130837840;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020151
|
// aapt resource value: 0x7f020151
|
||||||
public const int ic_subtype_keyboard = 2130837841;
|
public const int ic_subtype_mic = 2130837841;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020152
|
// aapt resource value: 0x7f020152
|
||||||
public const int ic_subtype_mic = 2130837842;
|
public const int ic_suggest_scroll_background = 2130837842;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020153
|
// aapt resource value: 0x7f020153
|
||||||
public const int ic_suggest_scroll_background = 2130837843;
|
public const int ic_suggest_strip_microphone = 2130837843;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020154
|
// aapt resource value: 0x7f020154
|
||||||
public const int ic_suggest_strip_microphone = 2130837844;
|
public const int ic_suggest_strip_microphone_swipe = 2130837844;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020155
|
// aapt resource value: 0x7f020155
|
||||||
public const int ic_suggest_strip_microphone_swipe = 2130837845;
|
public const int ic_unlocked_gray = 2130837845;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020156
|
// aapt resource value: 0x7f020156
|
||||||
public const int ic_unlocked_gray = 2130837846;
|
public const int keyboard_background = 2130837846;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020157
|
// aapt resource value: 0x7f020157
|
||||||
public const int keyboard_background = 2130837847;
|
public const int keyboard_dark_background = 2130837847;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020158
|
// aapt resource value: 0x7f020158
|
||||||
public const int keyboard_dark_background = 2130837848;
|
public const int keyboard_hint_0 = 2130837848;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020159
|
// aapt resource value: 0x7f020159
|
||||||
public const int keyboard_hint_0 = 2130837849;
|
public const int keyboard_hint_1 = 2130837849;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02015a
|
// aapt resource value: 0x7f02015a
|
||||||
public const int keyboard_hint_1 = 2130837850;
|
public const int keyboard_hint_2 = 2130837850;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02015b
|
// aapt resource value: 0x7f02015b
|
||||||
public const int keyboard_hint_2 = 2130837851;
|
public const int keyboard_hint_3 = 2130837851;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02015c
|
// aapt resource value: 0x7f02015c
|
||||||
public const int keyboard_hint_3 = 2130837852;
|
public const int keyboard_hint_4 = 2130837852;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02015d
|
// aapt resource value: 0x7f02015d
|
||||||
public const int keyboard_hint_4 = 2130837853;
|
public const int keyboard_hint_5 = 2130837853;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02015e
|
// aapt resource value: 0x7f02015e
|
||||||
public const int keyboard_hint_5 = 2130837854;
|
public const int keyboard_hint_6 = 2130837854;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02015f
|
// aapt resource value: 0x7f02015f
|
||||||
public const int keyboard_hint_6 = 2130837855;
|
public const int keyboard_hint_7 = 2130837855;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020160
|
// aapt resource value: 0x7f020160
|
||||||
public const int keyboard_hint_7 = 2130837856;
|
public const int keyboard_hint_8 = 2130837856;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020161
|
// aapt resource value: 0x7f020161
|
||||||
public const int keyboard_hint_8 = 2130837857;
|
public const int keyboard_hint_9 = 2130837857;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020162
|
// aapt resource value: 0x7f020162
|
||||||
public const int keyboard_hint_9 = 2130837858;
|
public const int keyboard_key_feedback = 2130837858;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020163
|
// aapt resource value: 0x7f020163
|
||||||
public const int keyboard_key_feedback = 2130837859;
|
public const int keyboard_key_feedback_background = 2130837859;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020164
|
// aapt resource value: 0x7f020164
|
||||||
public const int keyboard_key_feedback_background = 2130837860;
|
public const int keyboard_key_feedback_more_background = 2130837860;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020165
|
// aapt resource value: 0x7f020165
|
||||||
public const int keyboard_key_feedback_more_background = 2130837861;
|
public const int keyboard_popup_panel_background = 2130837861;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020166
|
// aapt resource value: 0x7f020166
|
||||||
public const int keyboard_popup_panel_background = 2130837862;
|
public const int keyboard_suggest_strip = 2130837862;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020167
|
// aapt resource value: 0x7f020167
|
||||||
public const int keyboard_suggest_strip = 2130837863;
|
public const int keyboard_suggest_strip_divider = 2130837863;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020168
|
// aapt resource value: 0x7f020168
|
||||||
public const int keyboard_suggest_strip_divider = 2130837864;
|
public const int list_selector_background_pressed = 2130837864;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020169
|
// aapt resource value: 0x7f020169
|
||||||
public const int list_selector_background_pressed = 2130837865;
|
public const int location_web_site = 2130837865;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02016a
|
// aapt resource value: 0x7f02016a
|
||||||
public const int location_web_site = 2130837866;
|
public const int location_web_site_holodark = 2130837866;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02016b
|
// aapt resource value: 0x7f02016b
|
||||||
public const int location_web_site_holodark = 2130837867;
|
public const int mic_slash = 2130837867;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02016c
|
// aapt resource value: 0x7f02016c
|
||||||
public const int mic_slash = 2130837868;
|
public const int navigation_accept = 2130837868;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02016d
|
// aapt resource value: 0x7f02016d
|
||||||
public const int navigation_accept = 2130837869;
|
public const int navigation_accept_dark = 2130837869;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02016e
|
// aapt resource value: 0x7f02016e
|
||||||
public const int navigation_accept_dark = 2130837870;
|
public const int navigation_cancel = 2130837870;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02016f
|
// aapt resource value: 0x7f02016f
|
||||||
public const int navigation_cancel = 2130837871;
|
public const int navigation_cancel_holodark = 2130837871;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020170
|
// aapt resource value: 0x7f020170
|
||||||
public const int navigation_cancel_holodark = 2130837872;
|
public const int navigation_previous_item = 2130837872;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020171
|
// aapt resource value: 0x7f020171
|
||||||
public const int navigation_previous_item = 2130837873;
|
public const int navigation_previous_item_dark = 2130837873;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020172
|
// aapt resource value: 0x7f020172
|
||||||
public const int navigation_previous_item_dark = 2130837874;
|
public const int notify = 2130837874;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020173
|
// aapt resource value: 0x7f020173
|
||||||
public const int notify = 2130837875;
|
public const int notify_keyboard = 2130837875;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020174
|
// aapt resource value: 0x7f020174
|
||||||
public const int notify_keyboard = 2130837876;
|
public const int ok_cancel = 2130837876;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020175
|
// aapt resource value: 0x7f020175
|
||||||
public const int ok_cancel = 2130837877;
|
public const int oktoberfest = 2130837877;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020176
|
// aapt resource value: 0x7f020176
|
||||||
public const int oktoberfest = 2130837878;
|
public const int old_ic_launcher_gray = 2130837878;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020177
|
// aapt resource value: 0x7f020177
|
||||||
public const int old_ic_launcher_gray = 2130837879;
|
public const int RedButton = 2130837879;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020178
|
// aapt resource value: 0x7f020178
|
||||||
public const int RedButton = 2130837880;
|
public const int section_header = 2130837880;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020179
|
// aapt resource value: 0x7f020179
|
||||||
public const int section_header = 2130837881;
|
public const int speak_now_level0 = 2130837881;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02017a
|
// aapt resource value: 0x7f02017a
|
||||||
public const int speak_now_level0 = 2130837882;
|
public const int speak_now_level1 = 2130837882;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02017b
|
// aapt resource value: 0x7f02017b
|
||||||
public const int speak_now_level1 = 2130837883;
|
public const int speak_now_level2 = 2130837883;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02017c
|
// aapt resource value: 0x7f02017c
|
||||||
public const int speak_now_level2 = 2130837884;
|
public const int speak_now_level3 = 2130837884;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02017d
|
// aapt resource value: 0x7f02017d
|
||||||
public const int speak_now_level3 = 2130837885;
|
public const int speak_now_level4 = 2130837885;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02017e
|
// aapt resource value: 0x7f02017e
|
||||||
public const int speak_now_level4 = 2130837886;
|
public const int speak_now_level5 = 2130837886;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02017f
|
// aapt resource value: 0x7f02017f
|
||||||
public const int speak_now_level5 = 2130837887;
|
public const int speak_now_level6 = 2130837887;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020180
|
// aapt resource value: 0x7f020180
|
||||||
public const int speak_now_level6 = 2130837888;
|
public const int sym_bkeyboard_123_mic = 2130837888;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020181
|
// aapt resource value: 0x7f020181
|
||||||
public const int sym_bkeyboard_123_mic = 2130837889;
|
public const int sym_bkeyboard_delete = 2130837889;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020182
|
// aapt resource value: 0x7f020182
|
||||||
public const int sym_bkeyboard_delete = 2130837890;
|
public const int sym_bkeyboard_done = 2130837890;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020183
|
// aapt resource value: 0x7f020183
|
||||||
public const int sym_bkeyboard_done = 2130837891;
|
public const int sym_bkeyboard_kp2a = 2130837891;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020184
|
// aapt resource value: 0x7f020184
|
||||||
public const int sym_bkeyboard_kp2a = 2130837892;
|
public const int sym_bkeyboard_mic = 2130837892;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020185
|
// aapt resource value: 0x7f020185
|
||||||
public const int sym_bkeyboard_mic = 2130837893;
|
public const int sym_bkeyboard_num0 = 2130837893;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020186
|
// aapt resource value: 0x7f020186
|
||||||
public const int sym_bkeyboard_num0 = 2130837894;
|
public const int sym_bkeyboard_num1 = 2130837894;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020187
|
// aapt resource value: 0x7f020187
|
||||||
public const int sym_bkeyboard_num1 = 2130837895;
|
public const int sym_bkeyboard_num2 = 2130837895;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020188
|
// aapt resource value: 0x7f020188
|
||||||
public const int sym_bkeyboard_num2 = 2130837896;
|
public const int sym_bkeyboard_num3 = 2130837896;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020189
|
// aapt resource value: 0x7f020189
|
||||||
public const int sym_bkeyboard_num3 = 2130837897;
|
public const int sym_bkeyboard_num4 = 2130837897;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02018a
|
// aapt resource value: 0x7f02018a
|
||||||
public const int sym_bkeyboard_num4 = 2130837898;
|
public const int sym_bkeyboard_num5 = 2130837898;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02018b
|
// aapt resource value: 0x7f02018b
|
||||||
public const int sym_bkeyboard_num5 = 2130837899;
|
public const int sym_bkeyboard_num6 = 2130837899;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02018c
|
// aapt resource value: 0x7f02018c
|
||||||
public const int sym_bkeyboard_num6 = 2130837900;
|
public const int sym_bkeyboard_num7 = 2130837900;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02018d
|
// aapt resource value: 0x7f02018d
|
||||||
public const int sym_bkeyboard_num7 = 2130837901;
|
public const int sym_bkeyboard_num8 = 2130837901;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02018e
|
// aapt resource value: 0x7f02018e
|
||||||
public const int sym_bkeyboard_num8 = 2130837902;
|
public const int sym_bkeyboard_num9 = 2130837902;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02018f
|
// aapt resource value: 0x7f02018f
|
||||||
public const int sym_bkeyboard_num9 = 2130837903;
|
public const int sym_bkeyboard_numalt = 2130837903;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020190
|
// aapt resource value: 0x7f020190
|
||||||
public const int sym_bkeyboard_numalt = 2130837904;
|
public const int sym_bkeyboard_numpound = 2130837904;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020191
|
// aapt resource value: 0x7f020191
|
||||||
public const int sym_bkeyboard_numpound = 2130837905;
|
public const int sym_bkeyboard_numstar = 2130837905;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020192
|
// aapt resource value: 0x7f020192
|
||||||
public const int sym_bkeyboard_numstar = 2130837906;
|
public const int sym_bkeyboard_return = 2130837906;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020193
|
// aapt resource value: 0x7f020193
|
||||||
public const int sym_bkeyboard_return = 2130837907;
|
public const int sym_bkeyboard_search = 2130837907;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020194
|
// aapt resource value: 0x7f020194
|
||||||
public const int sym_bkeyboard_search = 2130837908;
|
public const int sym_bkeyboard_settings = 2130837908;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020195
|
// aapt resource value: 0x7f020195
|
||||||
public const int sym_bkeyboard_settings = 2130837909;
|
public const int sym_bkeyboard_shift = 2130837909;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020196
|
// aapt resource value: 0x7f020196
|
||||||
public const int sym_bkeyboard_shift = 2130837910;
|
public const int sym_bkeyboard_shift_locked = 2130837910;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020197
|
// aapt resource value: 0x7f020197
|
||||||
public const int sym_bkeyboard_shift_locked = 2130837911;
|
public const int sym_bkeyboard_space = 2130837911;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020198
|
// aapt resource value: 0x7f020198
|
||||||
public const int sym_bkeyboard_space = 2130837912;
|
public const int sym_bkeyboard_tab = 2130837912;
|
||||||
|
|
||||||
// aapt resource value: 0x7f020199
|
// aapt resource value: 0x7f020199
|
||||||
public const int sym_bkeyboard_tab = 2130837913;
|
public const int sym_keyboard = 2130837913;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02019a
|
// aapt resource value: 0x7f02019a
|
||||||
public const int sym_keyboard = 2130837914;
|
public const int sym_keyboard_123_mic = 2130837914;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02019b
|
// aapt resource value: 0x7f02019b
|
||||||
public const int sym_keyboard_123_mic = 2130837915;
|
public const int sym_keyboard_delete = 2130837915;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02019c
|
// aapt resource value: 0x7f02019c
|
||||||
public const int sym_keyboard_delete = 2130837916;
|
public const int sym_keyboard_done = 2130837916;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02019d
|
// aapt resource value: 0x7f02019d
|
||||||
public const int sym_keyboard_done = 2130837917;
|
public const int sym_keyboard_feedback_123_mic = 2130837917;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02019e
|
// aapt resource value: 0x7f02019e
|
||||||
public const int sym_keyboard_feedback_123_mic = 2130837918;
|
public const int sym_keyboard_feedback_delete = 2130837918;
|
||||||
|
|
||||||
// aapt resource value: 0x7f02019f
|
// aapt resource value: 0x7f02019f
|
||||||
public const int sym_keyboard_feedback_delete = 2130837919;
|
public const int sym_keyboard_feedback_done = 2130837919;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a0
|
// aapt resource value: 0x7f0201a0
|
||||||
public const int sym_keyboard_feedback_done = 2130837920;
|
public const int sym_keyboard_feedback_kp2a = 2130837920;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a1
|
// aapt resource value: 0x7f0201a1
|
||||||
public const int sym_keyboard_feedback_kp2a = 2130837921;
|
public const int sym_keyboard_feedback_language_arrows_left = 2130837921;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a2
|
// aapt resource value: 0x7f0201a2
|
||||||
public const int sym_keyboard_feedback_language_arrows_left = 2130837922;
|
public const int sym_keyboard_feedback_language_arrows_right = 2130837922;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a3
|
// aapt resource value: 0x7f0201a3
|
||||||
public const int sym_keyboard_feedback_language_arrows_right = 2130837923;
|
public const int sym_keyboard_feedback_mic = 2130837923;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a4
|
// aapt resource value: 0x7f0201a4
|
||||||
public const int sym_keyboard_feedback_mic = 2130837924;
|
public const int sym_keyboard_feedback_numalt = 2130837924;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a5
|
// aapt resource value: 0x7f0201a5
|
||||||
public const int sym_keyboard_feedback_numalt = 2130837925;
|
public const int sym_keyboard_feedback_return = 2130837925;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a6
|
// aapt resource value: 0x7f0201a6
|
||||||
public const int sym_keyboard_feedback_return = 2130837926;
|
public const int sym_keyboard_feedback_search = 2130837926;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a7
|
// aapt resource value: 0x7f0201a7
|
||||||
public const int sym_keyboard_feedback_search = 2130837927;
|
public const int sym_keyboard_feedback_settings = 2130837927;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a8
|
// aapt resource value: 0x7f0201a8
|
||||||
public const int sym_keyboard_feedback_settings = 2130837928;
|
public const int sym_keyboard_feedback_shift = 2130837928;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201a9
|
// aapt resource value: 0x7f0201a9
|
||||||
public const int sym_keyboard_feedback_shift = 2130837929;
|
public const int sym_keyboard_feedback_shift_locked = 2130837929;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201aa
|
// aapt resource value: 0x7f0201aa
|
||||||
public const int sym_keyboard_feedback_shift_locked = 2130837930;
|
public const int sym_keyboard_feedback_space = 2130837930;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201ab
|
// aapt resource value: 0x7f0201ab
|
||||||
public const int sym_keyboard_feedback_space = 2130837931;
|
public const int sym_keyboard_feedback_tab = 2130837931;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201ac
|
// aapt resource value: 0x7f0201ac
|
||||||
public const int sym_keyboard_feedback_tab = 2130837932;
|
public const int sym_keyboard_kp2a = 2130837932;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201ad
|
// aapt resource value: 0x7f0201ad
|
||||||
public const int sym_keyboard_kp2a = 2130837933;
|
public const int sym_keyboard_language_arrows_left = 2130837933;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201ae
|
// aapt resource value: 0x7f0201ae
|
||||||
public const int sym_keyboard_language_arrows_left = 2130837934;
|
public const int sym_keyboard_language_arrows_right = 2130837934;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201af
|
// aapt resource value: 0x7f0201af
|
||||||
public const int sym_keyboard_language_arrows_right = 2130837935;
|
public const int sym_keyboard_mic = 2130837935;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b0
|
// aapt resource value: 0x7f0201b0
|
||||||
public const int sym_keyboard_mic = 2130837936;
|
public const int sym_keyboard_num0 = 2130837936;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b1
|
// aapt resource value: 0x7f0201b1
|
||||||
public const int sym_keyboard_num0 = 2130837937;
|
public const int sym_keyboard_num1 = 2130837937;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b2
|
// aapt resource value: 0x7f0201b2
|
||||||
public const int sym_keyboard_num1 = 2130837938;
|
public const int sym_keyboard_num2 = 2130837938;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b3
|
// aapt resource value: 0x7f0201b3
|
||||||
public const int sym_keyboard_num2 = 2130837939;
|
public const int sym_keyboard_num3 = 2130837939;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b4
|
// aapt resource value: 0x7f0201b4
|
||||||
public const int sym_keyboard_num3 = 2130837940;
|
public const int sym_keyboard_num4 = 2130837940;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b5
|
// aapt resource value: 0x7f0201b5
|
||||||
public const int sym_keyboard_num4 = 2130837941;
|
public const int sym_keyboard_num5 = 2130837941;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b6
|
// aapt resource value: 0x7f0201b6
|
||||||
public const int sym_keyboard_num5 = 2130837942;
|
public const int sym_keyboard_num6 = 2130837942;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b7
|
// aapt resource value: 0x7f0201b7
|
||||||
public const int sym_keyboard_num6 = 2130837943;
|
public const int sym_keyboard_num7 = 2130837943;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b8
|
// aapt resource value: 0x7f0201b8
|
||||||
public const int sym_keyboard_num7 = 2130837944;
|
public const int sym_keyboard_num8 = 2130837944;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201b9
|
// aapt resource value: 0x7f0201b9
|
||||||
public const int sym_keyboard_num8 = 2130837945;
|
public const int sym_keyboard_num9 = 2130837945;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201ba
|
// aapt resource value: 0x7f0201ba
|
||||||
public const int sym_keyboard_num9 = 2130837946;
|
public const int sym_keyboard_numalt = 2130837946;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201bb
|
// aapt resource value: 0x7f0201bb
|
||||||
public const int sym_keyboard_numalt = 2130837947;
|
public const int sym_keyboard_numpound = 2130837947;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201bc
|
// aapt resource value: 0x7f0201bc
|
||||||
public const int sym_keyboard_numpound = 2130837948;
|
public const int sym_keyboard_numstar = 2130837948;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201bd
|
// aapt resource value: 0x7f0201bd
|
||||||
public const int sym_keyboard_numstar = 2130837949;
|
public const int sym_keyboard_return = 2130837949;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201be
|
// aapt resource value: 0x7f0201be
|
||||||
public const int sym_keyboard_return = 2130837950;
|
public const int sym_keyboard_search = 2130837950;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201bf
|
// aapt resource value: 0x7f0201bf
|
||||||
public const int sym_keyboard_search = 2130837951;
|
public const int sym_keyboard_settings = 2130837951;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c0
|
// aapt resource value: 0x7f0201c0
|
||||||
public const int sym_keyboard_settings = 2130837952;
|
public const int sym_keyboard_shift = 2130837952;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c1
|
// aapt resource value: 0x7f0201c1
|
||||||
public const int sym_keyboard_shift = 2130837953;
|
public const int sym_keyboard_shift_lock = 2130837953;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c2
|
// aapt resource value: 0x7f0201c2
|
||||||
public const int sym_keyboard_shift_lock = 2130837954;
|
public const int sym_keyboard_shift_locked = 2130837954;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c3
|
// aapt resource value: 0x7f0201c3
|
||||||
public const int sym_keyboard_shift_locked = 2130837955;
|
public const int sym_keyboard_space = 2130837955;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c4
|
// aapt resource value: 0x7f0201c4
|
||||||
public const int sym_keyboard_space = 2130837956;
|
public const int sym_keyboard_space_led = 2130837956;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c5
|
// aapt resource value: 0x7f0201c5
|
||||||
public const int sym_keyboard_space_led = 2130837957;
|
public const int sym_keyboard_tab = 2130837957;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c6
|
// aapt resource value: 0x7f0201c6
|
||||||
public const int sym_keyboard_tab = 2130837958;
|
public const int transparent = 2130837958;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c7
|
// aapt resource value: 0x7f0201c7
|
||||||
public const int transparent = 2130837959;
|
public const int voice_ime_background = 2130837959;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c8
|
// aapt resource value: 0x7f0201c8
|
||||||
public const int voice_ime_background = 2130837960;
|
public const int voice_swipe_hint = 2130837960;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201c9
|
// aapt resource value: 0x7f0201c9
|
||||||
public const int voice_swipe_hint = 2130837961;
|
public const int working = 2130837961;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201ca
|
// aapt resource value: 0x7f0201ca
|
||||||
public const int working = 2130837962;
|
public const int YellowButton = 2130837962;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0201cb
|
|
||||||
public const int YellowButton = 2130837963;
|
|
||||||
|
|
||||||
static Drawable()
|
static Drawable()
|
||||||
{
|
{
|
||||||
|
@ -938,21 +938,6 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AndroidResource Include="Resources\values-bg-rBG\strings.xml" />
|
<AndroidResource Include="Resources\values-bg-rBG\strings.xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<AndroidResource Include="Resources\drawable\ic_launcher_gray_bday.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<AndroidResource Include="Resources\drawable-hdpi-v11\ic_launcher_gray_bday.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<AndroidResource Include="Resources\drawable-v11\ic_launcher_gray_bday.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<AndroidResource Include="Resources\drawable-xhdpi-v11\ic_launcher_gray_bday.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<AndroidResource Include="Resources\drawable-xxhdpi-v11\ic_launcher_gray_bday.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<TransformFile Include="Properties\AndroidManifest.xml" />
|
<TransformFile Include="Properties\AndroidManifest.xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
Loading…
Reference in New Issue
Block a user