moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-12-01 13:32:27 -05:00
Code Issues Releases Wiki Activity

Switched to Kp2aLog

Browse Source 
Added more debug logging
This commit is contained in:
Philipp Crocoll 2013-07-06 16:11:38 +02:00
parent 5f4d467da4
commit 77856dc990
14 changed files with 104 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keepass2android/EntryActivity.cs
View File

@ -138,11 +138,11 @@ namespace keepass2android
StartService(showNotIntent); StartService(showNotIntent);
Android.Util.Log.Debug("DEBUG", "Requesting copy to clipboard for Uuid=" + Entry.Uuid.ToHexString()); Kp2aLog.Log("Requesting copy to clipboard for Uuid=" + Entry.Uuid.ToHexString());
/*foreach (PwUuid key in App.Kp2a.GetDb().entries.Keys) /*foreach (PwUuid key in App.Kp2a.GetDb().entries.Keys)
{ {
Android.Util.Log.Debug("DEBUG",key.ToHexString() + " -> " + App.Kp2a.GetDb().entries[key].Uuid.ToHexString()); Kp2aLog.Log(this,key.ToHexString() + " -> " + App.Kp2a.GetDb().entries[key].Uuid.ToHexString());
}*/ }*/
if (closeAfterCreate) if (closeAfterCreate)

8
src/keepass2android/KeePass.cs
View File

@ -50,20 +50,20 @@ namespace keepass2android
{ {
base.OnCreate (bundle); base.OnCreate (bundle);
_appTask = AppTask.GetTaskInOnCreate(bundle, Intent); _appTask = AppTask.GetTaskInOnCreate(bundle, Intent);
Android.Util.Log.Debug("DEBUG","KeePass.OnCreate"); Kp2aLog.Log("KeePass.OnCreate");
} }
protected override void OnResume() protected override void OnResume()
{ {
base.OnResume(); base.OnResume();
Android.Util.Log.Debug("DEBUG","KeePass.OnResume"); Kp2aLog.Log("KeePass.OnResume");
} }
protected override void OnStart() protected override void OnStart()
{ {
base.OnStart(); base.OnStart();
Android.Util.Log.Debug("DEBUG", "KeePass.OnStart"); Kp2aLog.Log("KeePass.OnStart");
ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this); ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
@ -172,7 +172,7 @@ namespace keepass2android
protected override void OnDestroy() { protected override void OnDestroy() {
Android.Util.Log.Debug("DEBUG","KeePass.OnDestroy"+IsFinishing.ToString()); Kp2aLog.Log("KeePass.OnDestroy"+IsFinishing.ToString());
base.OnDestroy(); base.OnDestroy();
} }

23
src/keepass2android/LifecycleDebugActivity.cs
View File

@ -49,38 +49,47 @@ namespace keepass2android
protected override void OnResume() protected override void OnResume()
{ {
base.OnResume(); base.OnResume();
Android.Util.Log.Debug("DEBUG",ClassName+".OnResume"); Kp2aLog.Log(ClassName+".OnResume");
if (App.Kp2a.GetDb() == null)
{
Kp2aLog.Log(" DB null");
}
else
{
Kp2aLog.Log(" Loaded=" + App.Kp2a.GetDb().Loaded + ", Locked=" + App.Kp2a.GetDb().Locked
+ ", shutdown=" + App.Kp2a.IsShutdown());
}
} }
protected override void OnStart() protected override void OnStart()
{ {
base.OnStart(); base.OnStart();
Android.Util.Log.Debug("DEBUG",ClassName+".OnStart"); Kp2aLog.Log(ClassName+".OnStart");
} }
protected override void OnCreate(Bundle bundle) protected override void OnCreate(Bundle bundle)
{ {
base.OnCreate(bundle); base.OnCreate(bundle);
Android.Util.Log.Debug("DEBUG",ClassName+".OnCreate"); Kp2aLog.Log(ClassName+".OnCreate");
Android.Util.Log.Debug("DEBUG", ClassName+":apptask="+Intent.GetStringExtra("KP2A_APP_TASK_TYPE")); Kp2aLog.Log(ClassName+":apptask="+Intent.GetStringExtra("KP2A_APP_TASK_TYPE"));
} }
protected override void OnDestroy() protected override void OnDestroy()
{ {
base.OnDestroy(); base.OnDestroy();
Android.Util.Log.Debug("DEBUG",ClassName+".OnDestroy"+IsFinishing.ToString()); Kp2aLog.Log(ClassName+".OnDestroy"+IsFinishing.ToString());
} }
protected override void OnPause() protected override void OnPause()
{ {
base.OnPause(); base.OnPause();
Android.Util.Log.Debug("DEBUG",ClassName+".OnPause"); Kp2aLog.Log(ClassName+".OnPause");
} }
protected override void OnStop() protected override void OnStop()
{ {
base.OnStop(); base.OnStop();
Android.Util.Log.Debug("DEBUG",ClassName+".OnStop"); Kp2aLog.Log(ClassName+".OnStop");
} }
} }
} }

12
src/keepass2android/LockingListActivity.cs
View File

@ -52,39 +52,39 @@ namespace keepass2android
{ {
base.OnResume(); base.OnResume();
TimeoutHelper.Resume(this); TimeoutHelper.Resume(this);
Android.Util.Log.Debug("DEBUG",ClassName+".OnResume"); Kp2aLog.Log(ClassName+".OnResume");
} }
protected override void OnStart() protected override void OnStart()
{ {
base.OnStart(); base.OnStart();
Android.Util.Log.Debug("DEBUG",ClassName+".OnStart"); Kp2aLog.Log(ClassName+".OnStart");
} }
protected override void OnCreate(Bundle bundle) protected override void OnCreate(Bundle bundle)
{ {
base.OnCreate(bundle); base.OnCreate(bundle);
Android.Util.Log.Debug("DEBUG",ClassName+".OnCreate"); Kp2aLog.Log(ClassName+".OnCreate");
} }
protected override void OnDestroy() protected override void OnDestroy()
{ {
base.OnDestroy(); base.OnDestroy();
GC.Collect(); GC.Collect();
Android.Util.Log.Debug("DEBUG",ClassName+".OnDestroy"+IsFinishing.ToString()); Kp2aLog.Log(ClassName+".OnDestroy"+IsFinishing.ToString());
} }
protected override void OnPause() protected override void OnPause()
{ {
base.OnPause(); base.OnPause();
TimeoutHelper.Pause(this); TimeoutHelper.Pause(this);
Android.Util.Log.Debug("DEBUG",ClassName+".OnPause"); Kp2aLog.Log(ClassName+".OnPause");
} }
protected override void OnStop() protected override void OnStop()
{ {
base.OnStop(); base.OnStop();
Android.Util.Log.Debug("DEBUG",ClassName+".OnStop"); Kp2aLog.Log(ClassName+".OnStop");
} }
} }
} }

12
src/keepass2android/LockingPreferenceActivity.cs
View File

@ -49,39 +49,39 @@ namespace keepass2android
{ {
base.OnResume(); base.OnResume();
TimeoutHelper.Resume(this); TimeoutHelper.Resume(this);
Android.Util.Log.Debug("DEBUG",ClassName+".OnResume"); Kp2aLog.Log(ClassName+".OnResume");
} }
protected override void OnStart() protected override void OnStart()
{ {
base.OnStart(); base.OnStart();
Android.Util.Log.Debug("DEBUG",ClassName+".OnStart"); Kp2aLog.Log(ClassName+".OnStart");
} }
protected override void OnCreate(Bundle bundle) protected override void OnCreate(Bundle bundle)
{ {
base.OnCreate(bundle); base.OnCreate(bundle);
Android.Util.Log.Debug("DEBUG",ClassName+".OnCreate"); Kp2aLog.Log(ClassName+".OnCreate");
} }
protected override void OnDestroy() protected override void OnDestroy()
{ {
base.OnDestroy(); base.OnDestroy();
GC.Collect(); GC.Collect();
Android.Util.Log.Debug("DEBUG",ClassName+".OnDestroy"+IsFinishing.ToString()); Kp2aLog.Log(ClassName+".OnDestroy"+IsFinishing.ToString());
} }
protected override void OnPause() protected override void OnPause()
{ {
base.OnPause(); base.OnPause();
TimeoutHelper.Pause(this); TimeoutHelper.Pause(this);
Android.Util.Log.Debug("DEBUG",ClassName+".OnPause"); Kp2aLog.Log(ClassName+".OnPause");
} }
protected override void OnStop() protected override void OnStop()
{ {
base.OnStop(); base.OnStop();
Android.Util.Log.Debug("DEBUG",ClassName+".OnStop"); Kp2aLog.Log(ClassName+".OnStop");
} }
} }

4
src/keepass2android/PasswordActivity.cs
View File

@ -168,7 +168,7 @@ namespace keepass2android
Intent i = new Intent(this, typeof(QuickUnlock)); Intent i = new Intent(this, typeof(QuickUnlock));
PutIoConnectionToIntent(_ioConnection, i); PutIoConnectionToIntent(_ioConnection, i);
Android.Util.Log.Debug("DEBUG","Starting QuickUnlock"); Kp2aLog.Log("Starting QuickUnlock");
StartActivityForResult(i,0); StartActivityForResult(i,0);
return true; return true;
} }
@ -188,7 +188,7 @@ namespace keepass2android
base.OnActivityResult(requestCode, resultCode, data); base.OnActivityResult(requestCode, resultCode, data);
_startedWithActivityResult = true; _startedWithActivityResult = true;
Android.Util.Log.Debug("DEBUG","PasswordActivity.OnActivityResult "+resultCode+"/"+requestCode); Kp2aLog.Log("PasswordActivity.OnActivityResult "+resultCode+"/"+requestCode);
if (resultCode != KeePass.ExitCloseAfterTaskComplete) if (resultCode != KeePass.ExitCloseAfterTaskComplete)
{ {

88
src/keepass2android/Resources/Resource.designer.cs generated
View File

@ -2125,59 +2125,59 @@ namespace keepass2android
// aapt resource value: 0x7f0b001a // aapt resource value: 0x7f0b001a
public const int AdditionalStringLayout = 2131427354; public const int AdditionalStringLayout = 2131427354;
// aapt resource value: 0x7f0b0013 // aapt resource value: 0x7f0b0000
public const int Base = 2131427347; public const int Base = 2131427328;
// aapt resource value: 0x7f0b0014 // aapt resource value: 0x7f0b0014
public const int BottomBarActionButton = 2131427348; public const int BottomBarActionButton = 2131427348;
// aapt resource value: 0x7f0b0001 // aapt resource value: 0x7f0b0002
public const int Dialog = 2131427329; public const int Dialog = 2131427330;
// aapt resource value: 0x7f0b0011
public const int EditEntryButton = 2131427345;
// aapt resource value: 0x7f0b0006
public const int ElementText = 2131427334;
// aapt resource value: 0x7f0b0007
public const int ElementTextLarge = 2131427335;
// aapt resource value: 0x7f0b0005
public const int ElementTextSmall = 2131427333;
// aapt resource value: 0x7f0b000e
public const int ElementTextTitle = 2131427342;
// aapt resource value: 0x7f0b000d
public const int EntryFieldHeader = 2131427341;
// aapt resource value: 0x7f0b000f
public const int EntryItem = 2131427343;
// aapt resource value: 0x7f0b0012 // aapt resource value: 0x7f0b0012
public const int ExtraFieldHeader = 2131427346; public const int EditEntryButton = 2131427346;
// aapt resource value: 0x7f0b000a // aapt resource value: 0x7f0b0007
public const int GroupAndEntryHeader = 2131427338; public const int ElementText = 2131427335;
// aapt resource value: 0x7f0b0008 // aapt resource value: 0x7f0b0008
public const int GroupLabel = 2131427336; public const int ElementTextLarge = 2131427336;
// aapt resource value: 0x7f0b0003 // aapt resource value: 0x7f0b0006
public const int GroupText = 2131427331; public const int ElementTextSmall = 2131427334;
// aapt resource value: 0x7f0b0004 // aapt resource value: 0x7f0b000f
public const int GroupTextLarge = 2131427332; public const int ElementTextTitle = 2131427343;
// aapt resource value: 0x7f0b0002 // aapt resource value: 0x7f0b000e
public const int GroupTextSmall = 2131427330; public const int EntryFieldHeader = 2131427342;
// aapt resource value: 0x7f0b0010 // aapt resource value: 0x7f0b0010
public const int MinusButton = 2131427344; public const int EntryItem = 2131427344;
// aapt resource value: 0x7f0b0000 // aapt resource value: 0x7f0b0013
public const int NoTitleBar = 2131427328; public const int ExtraFieldHeader = 2131427347;
// aapt resource value: 0x7f0b000b
public const int GroupAndEntryHeader = 2131427339;
// aapt resource value: 0x7f0b0009
public const int GroupLabel = 2131427337;
// aapt resource value: 0x7f0b0004
public const int GroupText = 2131427332;
// aapt resource value: 0x7f0b0005
public const int GroupTextLarge = 2131427333;
// aapt resource value: 0x7f0b0003
public const int GroupTextSmall = 2131427331;
// aapt resource value: 0x7f0b0011
public const int MinusButton = 2131427345;
// aapt resource value: 0x7f0b0001
public const int NoTitleBar = 2131427329;
// aapt resource value: 0x7f0b0017 // aapt resource value: 0x7f0b0017
public const int TextAppearance_EditEntry = 2131427351; public const int TextAppearance_EditEntry = 2131427351;
@ -2194,14 +2194,14 @@ namespace keepass2android
// aapt resource value: 0x7f0b0019 // aapt resource value: 0x7f0b0019
public const int TextAppearance_SmallHeading = 2131427353; public const int TextAppearance_SmallHeading = 2131427353;
// aapt resource value: 0x7f0b0009 // aapt resource value: 0x7f0b000a
public const int WhiteOnBlack = 2131427337; public const int WhiteOnBlack = 2131427338;
// aapt resource value: 0x7f0b000b
public const int WhiteOnBlackSmall = 2131427339;
// aapt resource value: 0x7f0b000c // aapt resource value: 0x7f0b000c
public const int WhiteOnDarkSmall = 2131427340; public const int WhiteOnBlackSmall = 2131427340;
// aapt resource value: 0x7f0b000d
public const int WhiteOnDarkSmall = 2131427341;
static Style() static Style()
{ {

2
src/keepass2android/Utils/Util.cs
View File

@ -124,7 +124,7 @@ namespace keepass2android
packageManager.QueryIntentActivities(intent, packageManager.QueryIntentActivities(intent,
PackageInfoFlags.MatchDefaultOnly); PackageInfoFlags.MatchDefaultOnly);
foreach (ResolveInfo i in list) foreach (ResolveInfo i in list)
Android.Util.Log.Debug("DEBUG", i.ActivityInfo.ApplicationInfo.PackageName); Kp2aLog.Log(i.ActivityInfo.ApplicationInfo.PackageName);
return list.Count > 0; return list.Count > 0;
} }

6
src/keepass2android/app/App.cs
View File

@ -60,11 +60,13 @@ namespace keepass2android
public void SetShutdown() public void SetShutdown()
{ {
Kp2aLog.Log("set shutdown");
_shutdown = true; _shutdown = true;
} }
public void ClearShutdown() public void ClearShutdown()
{ {
Kp2aLog.Log("clear shutdown");
_shutdown = false; _shutdown = false;
} }
@ -282,7 +284,7 @@ namespace keepass2android
public override void OnCreate() { public override void OnCreate() {
base.OnCreate(); base.OnCreate();
Android.Util.Log.Debug("DEBUG","Creating application"); Kp2aLog.Log("Creating application "+PackageName+". Version=" + PackageManager.GetPackageInfo(PackageName, 0).VersionCode);
Kp2a.OnCreate(this); Kp2a.OnCreate(this);
@ -290,7 +292,7 @@ namespace keepass2android
public override void OnTerminate() { public override void OnTerminate() {
base.OnTerminate(); base.OnTerminate();
Android.Util.Log.Debug("DEBUG","Terminating application"); Kp2aLog.Log("Terminating application");
Kp2a.OnTerminate(); Kp2a.OnTerminate();
} }

4
src/keepass2android/app/AppTask.cs
View File

@ -124,7 +124,7 @@ namespace keepass2android
{ {
task = CreateFromIntent(intent); task = CreateFromIntent(intent);
} }
Android.Util.Log.Debug("DEBUG", "Loaded task " + task); Kp2aLog.Log("Loaded task " + task);
return task; return task;
} }
@ -154,7 +154,7 @@ namespace keepass2android
} }
catch (Exception e) catch (Exception e)
{ {
Android.Util.Log.Debug("DEBUG", "Cannot convert " + taskType + " in task: " + e); Kp2aLog.Log("Cannot convert " + taskType + " in task: " + e);
return new NullTask(); return new NullTask();
} }

14
src/keepass2android/fileselect/FileSelectActivity.cs
View File

@ -198,8 +198,8 @@ namespace keepass2android
{ {
base.OnCreate(savedInstanceState); base.OnCreate(savedInstanceState);
Android.Util.Log.Debug("DEBUG", "FileSelect.OnCreate"); Kp2aLog.Log("FileSelect.OnCreate");
Android.Util.Log.Debug("DEBUG", "FileSelect:apptask="+Intent.GetStringExtra("KP2A_APPTASK")); Kp2aLog.Log("FileSelect:apptask="+Intent.GetStringExtra("KP2A_APPTASK"));
if (Intent.Action == Intent.ActionSend) if (Intent.Action == Intent.ActionSend)
{ {
@ -457,7 +457,7 @@ namespace keepass2android
protected override void OnResume() protected override void OnResume()
{ {
base.OnResume(); base.OnResume();
Android.Util.Log.Debug("DEBUG", "FileSelect.OnResume"); Kp2aLog.Log("FileSelect.OnResume");
// Check to see if we need to change modes // Check to see if we need to change modes
if (_DbHelper.HasRecentFiles() != _recentMode) if (_DbHelper.HasRecentFiles() != _recentMode)
@ -507,7 +507,7 @@ namespace keepass2android
protected override void OnStart() protected override void OnStart()
{ {
base.OnStart(); base.OnStart();
Android.Util.Log.Debug("DEBUG", "FileSelect.OnStart"); Kp2aLog.Log("FileSelect.OnStart");
} }
public override bool OnCreateOptionsMenu(IMenu menu) { public override bool OnCreateOptionsMenu(IMenu menu) {
base.OnCreateOptionsMenu(menu); base.OnCreateOptionsMenu(menu);
@ -521,20 +521,20 @@ namespace keepass2android
protected override void OnPause() protected override void OnPause()
{ {
base.OnPause(); base.OnPause();
Android.Util.Log.Debug("DEBUG", "FileSelect.OnPause"); Kp2aLog.Log("FileSelect.OnPause");
} }
protected override void OnDestroy() protected override void OnDestroy()
{ {
base.OnDestroy(); base.OnDestroy();
GC.Collect(); GC.Collect();
Android.Util.Log.Debug("DEBUG", "FileSelect.OnDestroy"+IsFinishing.ToString()); Kp2aLog.Log("FileSelect.OnDestroy"+IsFinishing.ToString());
} }
protected override void OnStop() protected override void OnStop()
{ {
base.OnStop(); base.OnStop();
Android.Util.Log.Debug("DEBUG", "FileSelect.OnStop"); Kp2aLog.Log("FileSelect.OnStop");
} }
public override bool OnOptionsItemSelected(IMenuItem item) { public override bool OnOptionsItemSelected(IMenuItem item) {

4
src/keepass2android/keepass2android.csproj
View File

@ -365,7 +365,9 @@
<AndroidResource Include="Resources\menu\password.xml" /> <AndroidResource Include="Resources\menu\password.xml" />
<AndroidResource Include="Resources\values\colors.xml" /> <AndroidResource Include="Resources\values\colors.xml" />
<AndroidResource Include="Resources\values\config.xml" /> <AndroidResource Include="Resources\values\config.xml" />
<AndroidResource Include="Resources\values\styles.xml" /> <AndroidResource Include="Resources\values\styles.xml">
<SubType>Designer</SubType>
</AndroidResource>
<AndroidResource Include="Resources\xml\preferences.xml" /> <AndroidResource Include="Resources\xml\preferences.xml" />
<AndroidResource Include="Resources\xml\searchable.xml" /> <AndroidResource Include="Resources\xml\searchable.xml" />
<AndroidResource Include="Resources\values\strings.xml" /> <AndroidResource Include="Resources\values\strings.xml" />

4
src/keepass2android/services/CopyToClipboardService.cs
View File

@ -72,7 +72,7 @@ namespace keepass2android
public override StartCommandResult OnStartCommand(Intent intent, StartCommandFlags flags, int startId) public override StartCommandResult OnStartCommand(Intent intent, StartCommandFlags flags, int startId)
{ {
Android.Util.Log.Debug("DEBUG","Received intent to provide access to entry"); Kp2aLog.Log("Received intent to provide access to entry");
String uuidBytes = intent.GetStringExtra(EntryActivity.KeyEntry); String uuidBytes = intent.GetStringExtra(EntryActivity.KeyEntry);
bool closeAfterCreate = intent.GetBooleanExtra(EntryActivity.KeyCloseAfterCreate, false); bool closeAfterCreate = intent.GetBooleanExtra(EntryActivity.KeyCloseAfterCreate, false);
@ -119,7 +119,7 @@ namespace keepass2android
clearKeyboard(); clearKeyboard();
} }
Android.Util.Log.Debug("DEBUG", "Destroyed Show-Notification-Receiver."); Kp2aLog.Log("Destroyed Show-Notification-Receiver.");
base.OnDestroy(); base.OnDestroy();
} }

7
src/keepass2android/services/QuickUnlockForegroundService.cs
View File

@ -39,7 +39,7 @@ namespace keepass2android
public override StartCommandResult OnStartCommand(Intent intent, StartCommandFlags flags, int startId) public override StartCommandResult OnStartCommand(Intent intent, StartCommandFlags flags, int startId)
{ {
Android.Util.Log.Debug("DEBUG", "Starting QuickUnlockForegroundService"); Kp2aLog.Log("Starting QuickUnlockForegroundService");
//create notification item //create notification item
NotificationCompat.Builder mBuilder = NotificationCompat.Builder mBuilder =
@ -56,6 +56,7 @@ namespace keepass2android
PendingIntent startKp2APendingIntent = PendingIntent startKp2APendingIntent =
PendingIntent.GetActivity(this, 0, startKp2aIntent, PendingIntentFlags.UpdateCurrent); PendingIntent.GetActivity(this, 0, startKp2aIntent, PendingIntentFlags.UpdateCurrent);
mBuilder.SetContentIntent(startKp2APendingIntent); mBuilder.SetContentIntent(startKp2APendingIntent);
StartForeground(QuickUnlockForegroundServiceId , mBuilder.Build()); StartForeground(QuickUnlockForegroundServiceId , mBuilder.Build());
return StartCommandResult.NotSticky; return StartCommandResult.NotSticky;
@ -65,13 +66,13 @@ namespace keepass2android
public override void OnCreate() public override void OnCreate()
{ {
base.OnCreate(); base.OnCreate();
Android.Util.Log.Debug("DEBUG", "Creating QuickUnlockForegroundService"); Kp2aLog.Log("Creating QuickUnlockForegroundService");
} }
public override void OnDestroy() public override void OnDestroy()
{ {
base.OnDestroy(); base.OnDestroy();
Android.Util.Log.Debug("DEBUG", "Destroying QuickUnlockForegroundService"); Kp2aLog.Log("Destroying QuickUnlockForegroundService");
} }
} }
} }