moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-11-11 20:15:04 -05:00
Code Issues Releases Wiki Activity

Merge branch 'Branch_1.0.0-pre7c'

Browse Source 
Conflicts:
	src/java/JavaFileStorage/app/build/outputs/aar/app-debug.aar
	src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
	src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar
This commit is contained in:
Philipp Crocoll 2016-02-16 11:59:39 +01:00
commit 0e40033d85
8 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
View File

@ -115,7 +115,6 @@
<Compile Include="ProgressTask.cs" />
<Compile Include="PwGroupEqualityFromIdComparer.cs" />
<Compile Include="PwUuidEqualityComparer.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SearchDbHelper.cs" />
<Compile Include="ProgressDialogStatusLogger.cs" />
@ -148,16 +147,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<Folder Include="Resources\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

2
src/java/JavaFileStorage/.idea/vcs.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
</component>
</project>

2
src/java/JavaFileStorage/app/app.iml
View File

@ -104,8 +104,8 @@
<orderEntry type="library" exported="" name="httpcore-4.0.1" level="project" />
<orderEntry type="library" exported="" name="json_simple-1.1" level="project" />
<orderEntry type="library" exported="" name="google-http-client-android-1.16.0-rc" level="project" />
<orderEntry type="library" exported="" name="gson-2.1" level="project" />
<orderEntry type="library" exported="" name="google-http-client-gson-1.20.0" level="project" />
<orderEntry type="library" exported="" name="gson-2.1" level="project" />
<orderEntry type="library" exported="" name="google-http-client-jackson-1.16.0-rc" level="project" />
<orderEntry type="library" exported="" name="commons-logging-1.1.1" level="project" />
</component>

2
src/java/KP2ASoftkeyboard_AS/.idea/vcs.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
</component>
</project>

25
src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java
View File

@ -113,7 +113,8 @@ public class AutoFillService extends AccessibilityService {
if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED
|| event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED)
{
android.util.Log.d(_logTag, "event: " + event.getEventType() + ", package = " + event.getPackageName());
CharSequence packageName = event.getPackageName();
android.util.Log.d(_logTag, "event: " + event.getEventType() + ", package = " + packageName);
if ( "com.android.systemui".equals(event.getPackageName()) )
{
android.util.Log.d(_logTag, "return.");
@ -124,6 +125,13 @@ public class AutoFillService extends AccessibilityService {
android.util.Log.d(_logTag, "no com.android.systemui");
}
if ((packageName != null)
&& (packageName.toString().startsWith("keepass2android.")))
{
android.util.Log.d(_logTag, "don't autofill kp2a.");
return;
}
AccessibilityNodeInfo root = getRootInActiveWindow();
int eventWindowId = event.getWindowId();
if ((ExistsNodeOrChildren(root, new WindowIdCondition(eventWindowId)) && !ExistsNodeOrChildren(root, new SystemUiCondition())))
@ -283,7 +291,7 @@ public class AutoFillService extends AccessibilityService {
}
private void fillDataInTextField(AccessibilityNodeInfo edit, String value) {
if (value == null)
if ((value == null) || (edit == null))
return;
Bundle b = new Bundle();
b.putString(AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, value);
@ -309,12 +317,15 @@ public class AutoFillService extends AccessibilityService {
try {
uri = new URI(url);
String domain = uri.getHost();
if (domain == null)
return url;
return domain.startsWith("www.") ? domain.substring(4) : domain;
} catch (URISyntaxException e) {
android.util.Log.d(_logTag, "error parsing url: "+ url + e.toString());
return url;
}
}
private String getLastReceivedCredentialsUser() {
@ -364,9 +375,13 @@ public class AutoFillService extends AccessibilityService {
if (!urlFields.isEmpty())
{
AccessibilityNodeInfo addressField = urlFields.get(0);
url = addressField.getText().toString();
if (!url.contains("://"))
url = "http://" + url;
CharSequence text = addressField.getText();
if (text != null)
{
url = text.toString();
if (!url.contains("://"))
url = "http://" + url;
}
}
return url;
}

1
src/keepass2android/ChangeLog.cs
View File

@ -26,6 +26,7 @@ namespace keepass2android
AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog));
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
List<string> changeLog = new List<string>{
ctx.GetString(Resource.String.ChangeLog_1_0_0),
ctx.GetString(Resource.String.ChangeLog_0_9_9c),
ctx.GetString(Resource.String.ChangeLog_0_9_9),
ctx.GetString(Resource.String.ChangeLog_0_9_8c),

4
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="75"
android:versionName="1.0.0 preview 7b"
android:versionCode="76"
android:versionName="1.0.0 preview 7c"
package="keepass2android.keepass2android"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />

15
src/keepass2android/Resources/layout/password.xml
View File

@ -313,12 +313,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<Button
android:id="@+id/kill_app"
android:text="@string/kill_app_label"
android:layout_width="fill_parent"
android:layout_marginTop="16dp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/enable_quickunlock_container"
android:orientation="horizontal"
@ -363,7 +358,13 @@
android:text="@string/UseOfflineMode_Info"
android:background="?android:attr/selectableItemBackground"/>
</LinearLayout>
<Button
android:id="@+id/kill_app"
android:text="@string/kill_app_label"
android:layout_width="fill_parent"
android:layout_marginTop="16dp"
android:layout_height="wrap_content" />
<View
android:id="@+id/spacing"
android:layout_width="fill_parent"