Database: CanWrite=true made to default

ImeSwitcher: make sure only SecureSettings receives the broadcast
This commit is contained in:
Philipp Crocoll 2014-01-27 04:05:13 -08:00
parent c0267034f4
commit eff5157b01
7 changed files with 3118 additions and 1618 deletions

View File

@ -20,7 +20,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<OutputPath>bin\Debug</OutputPath> <OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants> <DefineConstants>DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause> <ConsolePause>False</ConsolePause>

View File

@ -20,7 +20,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants> <DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

View File

@ -62,6 +62,7 @@ namespace keepass2android
{ {
DrawableFactory = drawableFactory; DrawableFactory = drawableFactory;
_app = app; _app = app;
CanWrite = true; //default
} }
private bool _loaded; private bool _loaded;
@ -193,6 +194,7 @@ namespace keepass2android
Root = null; Root = null;
KpDatabase = null; KpDatabase = null;
_loaded = false; _loaded = false;
CanWrite = true;
_reloadRequested = false; _reloadRequested = false;
OtpAuxFileIoc = null; OtpAuxFileIoc = null;
} }

View File

@ -18,6 +18,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.Toast; import android.widget.Toast;
public class ImeSwitcher { public class ImeSwitcher {
private static final String SECURE_SETTINGS_PACKAGE_NAME = "com.intangibleobject.securesettings.plugin";
private static final String PREVIOUS_KEYBOARD = "previous_keyboard"; private static final String PREVIOUS_KEYBOARD = "previous_keyboard";
private static final String KP2A_SWITCHER = "KP2A_Switcher"; private static final String KP2A_SWITCHER = "KP2A_Switcher";
private static final String Tag = "KP2A_SWITCHER"; private static final String Tag = "KP2A_SWITCHER";
@ -47,7 +48,7 @@ public class ImeSwitcher {
boolean sentBroadcast = false; boolean sentBroadcast = false;
for (ResolveInfo ri: pkgAppsList) for (ResolveInfo ri: pkgAppsList)
{ {
if (ri.activityInfo.packageName.equals("com.intangibleobject.securesettings.plugin")) if (ri.activityInfo.packageName.equals(SECURE_SETTINGS_PACKAGE_NAME))
{ {
String currentIme = android.provider.Settings.Secure.getString( String currentIme = android.provider.Settings.Secure.getString(
@ -67,6 +68,7 @@ public class ImeSwitcher {
b.putString("com.intangibleobject.securesettings.plugin.extra.INPUT_METHOD", newImeName); b.putString("com.intangibleobject.securesettings.plugin.extra.INPUT_METHOD", newImeName);
b.putString("com.intangibleobject.securesettings.plugin.extra.SETTING","default_input_method"); b.putString("com.intangibleobject.securesettings.plugin.extra.SETTING","default_input_method");
i.putExtra("com.twofortyfouram.locale.intent.extra.BUNDLE", b); i.putExtra("com.twofortyfouram.locale.intent.extra.BUNDLE", b);
i.setPackage(SECURE_SETTINGS_PACKAGE_NAME);
Log.d(Tag,"trying to switch by broadcast to SecureSettings"); Log.d(Tag,"trying to switch by broadcast to SecureSettings");
ctx.sendBroadcast(i); ctx.sendBroadcast(i);
sentBroadcast = true; sentBroadcast = true;

File diff suppressed because it is too large Load Diff

View File

@ -398,7 +398,9 @@
<string name="ChangeLog_title">Change log</string> <string name="ChangeLog_title">Change log</string>
<string name="ChangeLog_0_9_3"> <string name="ChangeLog_0_9_3">
<b>Version 0.9.3 preview</b>\n <b>Version 0.9.3 preview 2</b>\n
* New keyboard with many improvements. See settings to customize.\n
* Read-only support for kdb (Keepass 1 files). Experimental!
* Added SFTP support\n * Added SFTP support\n
* Bug fixes\n * Bug fixes\n
</string> </string>

View File

@ -30,7 +30,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath> <OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants> <DefineConstants>DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause> <ConsolePause>False</ConsolePause>
@ -698,6 +698,10 @@
<Project>{70d3844a-d9fa-4a64-b205-a84c6a822196}</Project> <Project>{70d3844a-d9fa-4a64-b205-a84c6a822196}</Project>
<Name>KP2AKdbLibraryBinding</Name> <Name>KP2AKdbLibraryBinding</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Kp2aKeyboardBinding\Kp2aKeyboardBinding.csproj">
<Project>{a8779d4d-7c49-4c2f-82bd-2cdc448391da}</Project>
<Name>Kp2aKeyboardBinding</Name>
</ProjectReference>
<ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj" Condition="!$(DefineConstants.Contains('EXCLUDE_TWOFISH'))"> <ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj" Condition="!$(DefineConstants.Contains('EXCLUDE_TWOFISH'))">
<Project>{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}</Project> <Project>{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}</Project>
<Name>TwofishCipher</Name> <Name>TwofishCipher</Name>