mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-04 16:45:11 -05:00
resolved conflicts
This commit is contained in:
commit
c5c4332e74
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/src/keepass2android/bin
|
||||
/src/KeePassLib2Android/bin
|
||||
/src/KeePass.userprefs
|
||||
/src/keepass2android/Properties/AndroidManifest.xml
|
||||
|
@ -15,6 +15,7 @@ Global
|
||||
Release|Mixed Platforms = Release|Mixed Platforms
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
ReleaseNoNet|Any CPU = ReleaseNoNet|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
@ -33,6 +34,8 @@ Global
|
||||
{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|Win32.Build.0 = Release|Any CPU
|
||||
{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.Release|x64.Build.0 = Release|Any CPU
|
||||
{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
|
||||
{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
@ -49,6 +52,9 @@ Global
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|Win32.Build.0 = Release|Any CPU
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.Build.0 = Release|Any CPU
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
|
||||
{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
|
||||
|
||||
EndGlobalSection
|
||||
GlobalSection(MonoDevelopProperties) = preSolution
|
||||
StartupItem = keepass2android\keepass2android.csproj
|
||||
|
@ -36,6 +36,16 @@
|
||||
<ConsolePause>False</ConsolePause>
|
||||
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU' ">
|
||||
<DebugType>none</DebugType>
|
||||
<Optimize>True</Optimize>
|
||||
<OutputPath>bin\ReleaseNoNet</OutputPath>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
|
||||
<ConsolePause>False</ConsolePause>
|
||||
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Xml" />
|
||||
|
@ -27,12 +27,13 @@ using keepass2android.view;
|
||||
|
||||
namespace keepass2android
|
||||
{
|
||||
[Activity (Label = "@string/app_name", MainLauncher = true, Theme="@style/Base")]
|
||||
[Activity (Label = AppNames.AppName, MainLauncher = true, Theme="@style/Base")]
|
||||
[IntentFilter (new[]{Intent.ActionView},
|
||||
Label=AppNames.AppLauncherTitle,
|
||||
DataScheme="file",
|
||||
DataMimeType="*/*",
|
||||
DataHost="*",
|
||||
DataPathPattern=".*\\.kdbx", //TODO http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i
|
||||
DataPathPattern=".*\\.kdbx", //TODO http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i
|
||||
//http://stackoverflow.com/questions/1733195/android-intent-filter-for-a-particular-file-extension
|
||||
Categories=new[]{Intent.CategoryDefault, Intent.CategoryBrowsable})]
|
||||
public class KeePass : LifecycleDebugActivity
|
||||
|
7
src/keepass2android/Properties/AndroidManifest_nonet.xml
Normal file
7
src/keepass2android/Properties/AndroidManifest_nonet.xml
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="2" android:versionName="0.5.1 beta" package="keepass2android.keepass2android_nonet">
|
||||
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
|
||||
<application android:label="keepass2android" android:icon="@drawable/ic_launcher"></application>
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
</manifest>
|
740
src/keepass2android/Resources/Resource.designer.cs
generated
740
src/keepass2android/Resources/Resource.designer.cs
generated
File diff suppressed because it is too large
Load Diff
@ -37,7 +37,7 @@
|
||||
android:id="@+id/label_open_by_filename_details"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/file_filename"/>
|
||||
android:layout_below="@id/file_filename" />
|
||||
<Button
|
||||
android:id="@+id/open"
|
||||
android:text="@string/menu_open"
|
||||
|
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--Generated by crowdin.net-->
|
||||
<resources>
|
||||
<string name="about_feedback">Feedback</string>
|
||||
@ -13,6 +13,8 @@
|
||||
<string name="algorithm_colon">Algorithm</string>
|
||||
<string name="app_name">Keepass2Android</string>
|
||||
<string name="short_app_name">KP2A</string>
|
||||
<string name="app_name_nonet">Keepass2Android Offline</string>
|
||||
<string name="short_app_name_nonet">KP2A Offline</string>
|
||||
<string name="app_timeout">Application timeout</string>
|
||||
<string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
|
||||
<string name="application">Application</string>
|
||||
|
2
src/keepass2android/UseManifestNet.bat
Normal file
2
src/keepass2android/UseManifestNet.bat
Normal file
@ -0,0 +1,2 @@
|
||||
echo hallo!
|
||||
copy Properties\AndroidManifest_net.xml Properties\AndroidManifest.xml
|
2
src/keepass2android/UseManifestNoNet.bat
Normal file
2
src/keepass2android/UseManifestNoNet.bat
Normal file
@ -0,0 +1,2 @@
|
||||
echo hallo!
|
||||
copy Properties\AndroidManifest_nonet.xml Properties\AndroidManifest.xml
|
@ -29,11 +29,31 @@ using Android.Widget;
|
||||
|
||||
namespace keepass2android
|
||||
{
|
||||
///Application class for Keepass2Android: Contains static Database variable to be used by all components.
|
||||
#if RELEASE
|
||||
[Application(Debuggable=false, Label="@string/app_name")]
|
||||
#if NoNet
|
||||
public static class AppNames
|
||||
{
|
||||
public const string AppName = "@string/app_name_nonet";
|
||||
public const string AppNameShort = "@string/short_app_name_nonet";
|
||||
public const string AppLauncherTitle = "@string/short_app_name_nonet";
|
||||
}
|
||||
#else
|
||||
[Application(Debuggable=true, Label="@string/app_name")]
|
||||
public static class AppNames
|
||||
{
|
||||
public const string AppName = "@string/app_name";
|
||||
public const string AppNameShort = "@string/short_app_name";
|
||||
public const string AppLauncherTitle = "@string/app_name";
|
||||
}
|
||||
#endif
|
||||
|
||||
///Application class for Keepass2Android: Contains static Database variable to be used by all components.
|
||||
#if NoNet
|
||||
[Application(Debuggable=false, Label=AppNames.AppName)]
|
||||
#else
|
||||
#if RELEASE
|
||||
[Application(Debuggable=false, Label=AppNames.AppName)]
|
||||
#else
|
||||
[Application(Debuggable=true, Label=AppNames.AppName)]
|
||||
#endif
|
||||
#endif
|
||||
public class App : Application {
|
||||
|
||||
|
@ -124,10 +124,15 @@ namespace keepass2android
|
||||
openFileButton.Click += openFileButtonClick;
|
||||
//OPEN URL
|
||||
Button openUrlButton = (Button)FindViewById(Resource.Id.start_open_url);
|
||||
|
||||
#if NoNet
|
||||
openUrlButton.Visibility = ViewStates.Gone;
|
||||
#endif
|
||||
|
||||
EventHandler openUrlButtonClick = (object sender, EventArgs e) =>
|
||||
{
|
||||
if (currentAction == CurrentAction.OpenURL)
|
||||
return;
|
||||
return;
|
||||
currentAction = CurrentAction.OpenURL;
|
||||
fnform.Visibility = ViewStates.Visible;
|
||||
openButton.Visibility = ViewStates.Visible;
|
||||
@ -138,6 +143,7 @@ namespace keepass2android
|
||||
enterFilenameDetails.Visibility = enterFilenameDetails.Text == "" ? ViewStates.Gone : ViewStates.Visible;
|
||||
};
|
||||
openUrlButton.Click += openUrlButtonClick;
|
||||
|
||||
//CREATE NEW
|
||||
Button createNewButton = (Button)FindViewById(Resource.Id.start_create);
|
||||
EventHandler createNewButtonClick = (object sender, EventArgs e) =>
|
||||
|
@ -41,6 +41,27 @@
|
||||
<DeployExternal>True</DeployExternal>
|
||||
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
|
||||
<AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis>
|
||||
<CustomCommands>
|
||||
<CustomCommands>
|
||||
<Command type="BeforeBuild" command="UseManifestNet.bat" />
|
||||
</CustomCommands>
|
||||
</CustomCommands>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU' ">
|
||||
<DebugType>none</DebugType>
|
||||
<Optimize>False</Optimize>
|
||||
<OutputPath>bin\ReleaseNoNet</OutputPath>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
|
||||
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
|
||||
<DefineConstants>NoNet</DefineConstants>
|
||||
<DeployExternal>True</DeployExternal>
|
||||
<CustomCommands>
|
||||
<CustomCommands>
|
||||
<Command type="BeforeBuild" command="UseManifestNoNet.bat" workingdir="" />
|
||||
</CustomCommands>
|
||||
</CustomCommands>
|
||||
<AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
Loading…
Reference in New Issue
Block a user