qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow to export when working offline

Browse Source
This commit is contained in:
Philipp Crocoll
2017-07-10 11:44:04 +02:00
parent 1b99baa3ff
commit c82fc7d772
2 changed files with 88 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml generated
View File

@@ -40,11 +40,20 @@
<file leaf-file-name="AutoFillService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/autofill/AutoFillService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109">
<state relative-caret-position="4334">
<caret line="226" column="61" selection-start-line="226" selection-start-column="53" selection-end-line="226" selection-end-column="61" />
<folding>
<element signature="e#2189#2190#0" expanded="true" />
<element signature="e#2234#2235#0" expanded="true" />
<element signature="imports" expanded="false" />
<element signature="e#1586#1587#0" expanded="false" />
<element signature="e#1622#1623#0" expanded="false" />
<element signature="e#1697#1698#0" expanded="false" />
<element signature="e#1749#1750#0" expanded="false" />
<element signature="e#2832#2833#0" expanded="false" />
<element signature="e#2865#2866#0" expanded="false" />
<element signature="e#13142#13143#0" expanded="false" />
<element signature="e#13196#13197#0" expanded="false" />
<element signature="e#13254#13255#0" expanded="false" />
<element signature="e#13308#13309#0" expanded="false" />
</folding>
</state>
</provider>
@@ -53,7 +62,7 @@
<file leaf-file-name="AccessibilityEvent.class" pinned="false" current-in-tab="false">
<entry file="jar://$USER_HOME$/AppData/Local/Xamarin/Universal/AndroidSDK/platforms/android-23/android.jar!/android/view/accessibility/AccessibilityEvent.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<state relative-caret-position="902">
<caret line="47" column="28" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="28" />
<folding />
</state>
@@ -116,8 +125,8 @@
<file leaf-file-name="ImeSwitcher.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/kbbridge/ImeSwitcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<state relative-caret-position="138">
<caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" />
<folding />
</state>
</provider>
@@ -1442,6 +1451,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="AndroidView">
<subPane>
<PATH>
@@ -1463,9 +1473,8 @@
</subPane>
</pane>
<pane id="Scope" />
<pane id="ProjectPane" />
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="ProjectPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -1815,24 +1824,23 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3903819" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.38941178" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32879046" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24436091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30235294" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1850,6 +1858,7 @@
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32879046" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30235294" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@@ -1920,8 +1929,17 @@
<state relative-caret-position="0">
<caret line="406" column="0" selection-start-line="406" selection-start-column="0" selection-end-line="406" selection-end-column="0" />
<folding>
<element signature="e#2189#2190#0" expanded="true" />
<element signature="e#2234#2235#0" expanded="true" />
<element signature="imports" expanded="false" />
<element signature="e#1586#1587#0" expanded="false" />
<element signature="e#1622#1623#0" expanded="false" />
<element signature="e#1697#1698#0" expanded="false" />
<element signature="e#1749#1750#0" expanded="false" />
<element signature="e#2832#2833#0" expanded="false" />
<element signature="e#2865#2866#0" expanded="false" />
<element signature="e#13142#13143#0" expanded="false" />
<element signature="e#13196#13197#0" expanded="false" />
<element signature="e#13254#13255#0" expanded="false" />
<element signature="e#13308#13309#0" expanded="false" />
</folding>
</state>
</provider>
@@ -1946,7 +1964,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="67" column="33" selection-start-line="67" selection-start-column="33" selection-end-line="67" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
@@ -2001,8 +2018,17 @@
<state relative-caret-position="0">
<caret line="406" column="0" selection-start-line="406" selection-start-column="0" selection-end-line="406" selection-end-column="0" />
<folding>
<element signature="e#2189#2190#0" expanded="true" />
<element signature="e#2234#2235#0" expanded="true" />
<element signature="imports" expanded="false" />
<element signature="e#1586#1587#0" expanded="false" />
<element signature="e#1622#1623#0" expanded="false" />
<element signature="e#1697#1698#0" expanded="false" />
<element signature="e#1749#1750#0" expanded="false" />
<element signature="e#2832#2833#0" expanded="false" />
<element signature="e#2865#2866#0" expanded="false" />
<element signature="e#13142#13143#0" expanded="false" />
<element signature="e#13196#13197#0" expanded="false" />
<element signature="e#13254#13255#0" expanded="false" />
<element signature="e#13308#13309#0" expanded="false" />
</folding>
</state>
</provider>
@@ -2027,7 +2053,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="67" column="33" selection-start-line="67" selection-start-column="33" selection-end-line="67" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
@@ -2179,7 +2204,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
<caret line="67" column="33" selection-start-line="67" selection-start-column="33" selection-end-line="67" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
@@ -2215,17 +2239,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="45" selection-start-line="14" selection-start-column="45" selection-end-line="14" selection-end-column="45" />
<folding />
</state>
</provider>
<provider editor-type-id="android-manifest">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/softkeyboard/KP2AKeyboard.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5500">
@@ -2279,12 +2292,43 @@
</entry>
<entry file="jar://$USER_HOME$/AppData/Local/Xamarin/Universal/AndroidSDK/platforms/android-23/android.jar!/android/view/accessibility/AccessibilityEvent.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<state relative-caret-position="902">
<caret line="47" column="28" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/autofill/AutoFillService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4334">
<caret line="226" column="61" selection-start-line="226" selection-start-column="53" selection-end-line="226" selection-end-column="61" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1586#1587#0" expanded="false" />
<element signature="e#1622#1623#0" expanded="false" />
<element signature="e#1697#1698#0" expanded="false" />
<element signature="e#1749#1750#0" expanded="false" />
<element signature="e#2832#2833#0" expanded="false" />
<element signature="e#2865#2866#0" expanded="false" />
<element signature="e#13142#13143#0" expanded="false" />
<element signature="e#13196#13197#0" expanded="false" />
<element signature="e#13254#13255#0" expanded="false" />
<element signature="e#13308#13309#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="45" selection-start-line="14" selection-start-column="45" selection-end-line="14" selection-end-column="45" />
<folding />
</state>
</provider>
<provider editor-type-id="android-manifest">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gradle.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -2293,21 +2337,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/autofill/AutoFillService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109">
<caret line="226" column="61" selection-start-line="226" selection-start-column="53" selection-end-line="226" selection-end-column="61" />
<folding>
<element signature="e#2189#2190#0" expanded="true" />
<element signature="e#2234#2235#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/kbbridge/ImeSwitcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<state relative-caret-position="138">
<caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" />
<folding />
</state>
</provider>

12
src/keepass2android/ExportDatabaseActivity.cs
View File

@@ -211,7 +211,12 @@ namespace keepass2android
try
{
using (var writeTransaction =_app.GetFileStorage(_targetIoc).OpenWriteTransaction(_targetIoc, _app.GetDb().KpDatabase.UseFileTransactions))
var fileStorage = _app.GetFileStorage(_targetIoc);
if (fileStorage is IOfflineSwitchable)
{
((IOfflineSwitchable) fileStorage).IsOffline = false;
}
using (var writeTransaction = fileStorage.OpenWriteTransaction(_targetIoc, _app.GetDb().KpDatabase.UseFileTransactions))
{
Stream sOut = writeTransaction.OpenFile();
_fileFormat.Export(pwInfo, sOut, new NullStatusLogger());
@@ -221,6 +226,11 @@ namespace keepass2android
writeTransaction.CommitWrite();
}
if (fileStorage is IOfflineSwitchable)
{
((IOfflineSwitchable)fileStorage).IsOffline = App.Kp2a.OfflineMode;
}
Finish(true);