Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • infrastruktur/warppay-app
  • HoelShare/warppay-app
2 results
Show changes
Commits on Source (38)
Hide whitespace changes
Inline Side-by-side
Showing
with 422 additions and 463 deletions
.gitignore 0 → 100644
View file @ a73494b9
WarpDrinkApi/.settings/
WarpDrinkApi/.classpath
WarpDrinkApi/.project
WarpDrinkApi/target/
WarpDrinkApp/.idea/compiler.xml
WarpDrinkApp/.idea/
*.iml
WarpDrinkApp/.idea/.name deleted 100644 → 0
View file @ e6bcd116
WarpDrinkApp
\ No newline at end of file
WarpDrinkApp/.idea/compiler.xml deleted 100644 → 0
View file @ e6bcd116
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/gradle.xml deleted 100644 → 0
View file @ e6bcd116
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.2.1" />
<option name="gradleJvm" value="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/misc.xml deleted 100644 → 0
View file @ e6bcd116
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/modules.xml deleted 100644 → 0
View file @ e6bcd116
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/WarpDrinkApp.iml" filepath="$PROJECT_DIR$/WarpDrinkApp.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/vcs.xml deleted 100644 → 0
View file @ e6bcd116
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
WarpDrinkApp/WarpDrink.iml
View file @ a73494b9
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="WarpDrink" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id="WarpPay" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
......
WarpDrinkApp/WarpDrinkApp.iml deleted 100644 → 0
View file @ e6bcd116
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="WarpDrinkApp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
WarpDrinkApp/app/app.iml deleted 100644 → 0
View file @ e6bcd116
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="WarpDrinkApp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="activeandroid-3.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
</component>
</module>
\ No newline at end of file
WarpDrinkApp/app/build.gradle
View file @ a73494b9
apply plugin: 'com.android.application'
android {
compileSdkVersion 22
buildToolsVersion "23.0.0 rc2"
compileSdkVersion 21
buildToolsVersion '25.0.0'
defaultConfig {
applicationId "ms.itsecteam.warpdrink"
applicationId "ms.warpzone.warppay"
minSdkVersion 15
targetSdkVersion 22
versionCode 1
......@@ -17,9 +17,33 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/notice.txt'
exclude 'META-INF/license.txt'
}
repositories {
mavenCentral()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.fasterxml.jackson.core:jackson-databind:2.0.1'
compile group: 'org.mindrot', name: 'jbcrypt', version: '0.4'
compile 'org.springframework.android:spring-android-rest-template:1.0.1.RELEASE'
compile group: 'org.apache.httpcomponents' , name: 'httpclient-android' , version: '4.3.5.1'
compile group: 'com.squareup.retrofit' , name: 'retrofit' , version: '2.0.0-beta2'
compile group: 'com.squareup.retrofit' , name: 'converter-gson' , version: '2.0.0-beta2'
compile group: 'com.google.code.gson' , name: 'gson' , version: '2.7'
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
compile group: 'com.squareup.okio' , name: 'okio' , version: '1.9.0'
compile group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5'
compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.5.3'
}
WarpDrinkApp/app/hs_err_pid13888.log 0 → 100644
View file @ a73494b9
#
# There is insufficient memory for the Java Runtime Environment to continue.
# Native memory allocation (malloc) failed to allocate 1048576 bytes for AllocateHeap
# Possible reasons:
# The system is out of physical RAM or swap space
# In 32 bit mode, the process size limit was hit
# Possible solutions:
# Reduce memory load on the system
# Increase physical memory or swap space
# Check if swap backing store is full
# Use 64 bit Java on a 64 bit OS
# Decrease Java heap size (-Xmx/-Xms)
# Decrease number of Java threads
# Decrease Java thread stack sizes (-Xss)
# Set larger code cache with -XX:ReservedCodeCacheSize=
# This output file may be truncated or incomplete.
#
# Out of Memory Error (memory/allocation.inline.hpp:61), pid=13888, tid=5780
#
# JRE version: (7.0_51-b13) (build )
# Java VM: Java HotSpot(TM) 64-Bit Server VM (24.51-b03 mixed mode windows-amd64 compressed oops)
# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
#
--------------- T H R E A D ---------------
Current thread (0x0000000001dc0800): JavaThread "Unknown thread" [_thread_in_vm, id=5780, stack(0x0000000001cc0000,0x0000000001dc0000)]
Stack: [0x0000000001cc0000,0x0000000001dc0000]
--------------- P R O C E S S ---------------
Java Threads: ( => current thread )
Other Threads:
=>0x0000000001dc0800 (exited) JavaThread "Unknown thread" [_thread_in_vm, id=5780, stack(0x0000000001cc0000,0x0000000001dc0000)]
VM state:not at safepoint (normal execution)
VM Mutex/Monitor currently owned by a thread: None
Heap
PSYoungGen total 55296K, used 952K [0x00000000eaa80000, 0x00000000ee800000, 0x0000000100000000)
eden space 47616K, 2% used [0x00000000eaa80000,0x00000000eab6e1b0,0x00000000ed900000)
from space 7680K, 0% used [0x00000000ee080000,0x00000000ee080000,0x00000000ee800000)
to space 7680K, 0% used [0x00000000ed900000,0x00000000ed900000,0x00000000ee080000)
ParOldGen total 125440K, used 0K [0x00000000c0000000, 0x00000000c7a80000, 0x00000000eaa80000)
object space 125440K, 0% used [0x00000000c0000000,0x00000000c0000000,0x00000000c7a80000)
PSPermGen total 21504K, used 673K [0x00000000bae00000, 0x00000000bc300000, 0x00000000c0000000)
object space 21504K, 3% used [0x00000000bae00000,0x00000000baea8570,0x00000000bc300000)
Card table byte_map: [0x0000000004f80000,0x00000000051b0000] byte_map_base: 0x00000000049a9000
Polling page: 0x0000000000460000
Code Cache [0x0000000001ec0000, 0x0000000002130000, 0x0000000004ec0000)
total_blobs=38 nmethods=0 adapters=20 free_code_cache=48889Kb largest_free_block=50062528
Compilation events (0 events):
No events
GC Heap History (0 events):
No events
Deoptimization events (0 events):
No events
Internal exceptions (0 events):
No events
Events (10 events):
Event: 0.071 loading class 0x0000000001e0f2c0
Event: 0.071 loading class 0x0000000001e0f2c0 done
Event: 0.071 loading class 0x0000000001e0f310
Event: 0.071 loading class 0x0000000001e0f310 done
Event: 0.071 loading class 0x0000000001e0f360
Event: 0.072 loading class 0x0000000001e0f360 done
Event: 0.072 loading class 0x0000000001e100c0
Event: 0.072 loading class 0x0000000001e100c0 done
Event: 0.072 loading class 0x0000000001e0fce0
Event: 0.072 loading class 0x0000000001e0fce0 done
Dynamic libraries:
0x00007ff751e40000 - 0x00007ff751e73000 C:\Program Files\Java\jdk1.7.0_51\bin\java.exe
0x00007fffc8560000 - 0x00007fffc870c000 C:\WINDOWS\SYSTEM32\ntdll.dll
0x00007fffc8110000 - 0x00007fffc824a000 C:\WINDOWS\system32\KERNEL32.DLL
0x00007fffc5970000 - 0x00007fffc5a7f000 C:\WINDOWS\system32\KERNELBASE.dll
0x00007fffc4380000 - 0x00007fffc440e000 C:\WINDOWS\system32\apphelp.dll
0x00007fffb3d30000 - 0x00007fffb3d83000 C:\WINDOWS\AppPatch\AppPatch64\AcGenral.DLL
0x00007fffc6140000 - 0x00007fffc61e7000 C:\WINDOWS\system32\msvcrt.dll
0x00007fffc5650000 - 0x00007fffc567b000 C:\WINDOWS\SYSTEM32\SspiCli.dll
0x00007fffc5cb0000 - 0x00007fffc5d01000 C:\WINDOWS\system32\SHLWAPI.dll
0x00007fffc6690000 - 0x00007fffc6801000 C:\WINDOWS\system32\USER32.dll
0x00007fffc7d90000 - 0x00007fffc7f08000 C:\WINDOWS\system32\ole32.dll
0x00007fffc6830000 - 0x00007fffc7d48000 C:\WINDOWS\system32\SHELL32.dll
0x00007fffc4e10000 - 0x00007fffc4e2f000 C:\WINDOWS\SYSTEM32\USERENV.dll
0x00007fffc65e0000 - 0x00007fffc6685000 C:\WINDOWS\system32\ADVAPI32.dll
0x00007fffb7ba0000 - 0x00007fffb7bbb000 C:\WINDOWS\SYSTEM32\MPR.dll
0x00007fffc5ec0000 - 0x00007fffc5ff7000 C:\WINDOWS\system32\RPCRT4.dll
0x00007fffc8250000 - 0x00007fffc82a9000 C:\WINDOWS\SYSTEM32\sechost.dll
0x00007fffc8380000 - 0x00007fffc8556000 C:\WINDOWS\SYSTEM32\combase.dll
0x00007fffc6490000 - 0x00007fffc65d4000 C:\WINDOWS\system32\GDI32.dll
0x00007fffc57a0000 - 0x00007fffc57b4000 C:\WINDOWS\SYSTEM32\profapi.dll
0x00007fffc42c0000 - 0x00007fffc4372000 C:\WINDOWS\SYSTEM32\SHCORE.dll
0x00007fffc7d50000 - 0x00007fffc7d84000 C:\WINDOWS\system32\IMM32.DLL
0x00007fffc7f10000 - 0x00007fffc8062000 C:\WINDOWS\system32\MSCTF.dll
0x00000000500c0000 - 0x00000000500f8000 C:\PROGRA~2\Sophos\SOPHOS~1\SOPHOS~2.DLL
0x00007fffc6130000 - 0x00007fffc6137000 C:\WINDOWS\system32\PSAPI.DLL
0x00007fffc3740000 - 0x00007fffc39ba000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.9600.17810_none_6240b9c7ecbd0bda\COMCTL32.dll
0x0000000075ef0000 - 0x0000000075fc2000 C:\Program Files\Java\jdk1.7.0_51\jre\bin\msvcr100.dll
0x0000000073cf0000 - 0x00000000744b9000 C:\Program Files\Java\jdk1.7.0_51\jre\bin\server\jvm.dll
0x00007fffbc460000 - 0x00007fffbc469000 C:\WINDOWS\SYSTEM32\WSOCK32.dll
0x00007fffc3090000 - 0x00007fffc30af000 C:\WINDOWS\SYSTEM32\WINMM.dll
0x00007fffc82b0000 - 0x00007fffc8308000 C:\WINDOWS\system32\WS2_32.dll
0x00007fffc3050000 - 0x00007fffc307a000 C:\WINDOWS\SYSTEM32\WINMMBASE.dll
0x00007fffc5eb0000 - 0x00007fffc5eb9000 C:\WINDOWS\system32\NSI.dll
0x00007fffc5a80000 - 0x00007fffc5aca000 C:\WINDOWS\SYSTEM32\cfgmgr32.dll
0x00007fffc45f0000 - 0x00007fffc4616000 C:\WINDOWS\SYSTEM32\DEVOBJ.dll
0x0000000050090000 - 0x000000005009f000 C:\Program Files\Java\jdk1.7.0_51\jre\bin\verify.dll
0x0000000074800000 - 0x0000000074828000 C:\Program Files\Java\jdk1.7.0_51\jre\bin\java.dll
0x00000000747e0000 - 0x00000000747f5000 C:\Program Files\Java\jdk1.7.0_51\jre\bin\zip.dll
VM Arguments:
jvm_args: -Xmx1024M -Dfile.encoding=windows-1252 -Duser.country=DE -Duser.language=de -Duser.variant
java_command: com.android.dx.command.Main --dex --num-threads=4 --output C:\Users\Chris\Documents\git\warpdrink\WarpDrinkApp\app\build\intermediates\pre-dexed\debug\jackson-core-2.0.1-ac38530da5103924c8b5ca722c5513a67af403c0.jar C:\Users\Chris\.gradle\caches\modules-2\files-2.1\com.fasterxml.jackson.core\jackson-core\2.0.1\481d14ec21e034ed45217c4854dbbf15940ce108\jackson-core-2.0.1.jar
Launcher Type: SUN_STANDARD
Environment Variables:
PATH=C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\idmu\common;C:\Program Files (x86)\GNU\GnuPG\pub;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\OpenVPN\bin;C:\Program Files (x86)\QuickTime\QTSystem\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Windows Live\Shared
USERNAME=chris
OS=Windows_NT
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 42 Stepping 7, GenuineIntel
--------------- S Y S T E M ---------------
OS: Windows 8 , 64 bit Build 9200
CPU:total 8 (4 cores per cpu, 2 threads per core) family 6 model 42 stepping 7, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, aes, ht, tsc, tscinvbit
Memory: 4k page, physical 12072340k(1312620k free), swap 17358432k(13148k free)
vm_info: Java HotSpot(TM) 64-Bit Server VM (24.51-b03) for windows-amd64 JRE (1.7.0_51-b13), built on Dec 18 2013 18:40:56 by "java_re" with unknown MS VC++:1600
time: Mon Jun 29 16:15:01 2015
elapsed time: 2 seconds
WarpDrinkApp/app/libs/activeandroid-3.0.jar deleted 100644 → 0
View file @ e6bcd116
File deleted
WarpDrinkApp/app/libs/codepath-utils.jar 0 → 100644
View file @ a73494b9
File added
WarpDrinkApp/app/libs/scribe-codepath-0.0.3.jar 0 → 100644
View file @ a73494b9
File added
WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warpdrink/ApplicationTest.java → WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warppay/ApplicationTest.java
View file @ a73494b9
package ms.itsecteam.warpdrink;
package ms.itsecteam.warppay;
import android.app.Application;
import android.test.ApplicationTestCase;
......
WarpDrinkApp/app/src/main/AndroidManifest.xml
View file @ a73494b9
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ms.itsecteam.warpdrink" >
package="ms.warpzone.warppay" >
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.NFC" />
<uses-feature
android:name="android.hardware.nfc"
android:required="true" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:name="ms.itsecteam.warpdrink.WarpDrinkApplication"
android:theme="@style/AppTheme" >
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<meta-data android:name="AA_DB_NAME" android:value="warpdrink_data.db" />
<meta-data android:name="AA_DB_VERSION" android:value="5" />
<meta-data
android:name="AA_MODELS"
android:value="ms.itsecteam.warpdrink.data.User" />
android:largeHeap="true"
android:name="ms.warpzone.warppay.WarpPayApplication"
android:theme="@style/AppTheme">
<meta-data android:name="AA_DB_NAME" android:value="warppay_new.db" />
<meta-data android:name="AA_DB_VERSION" android:value="15" />
<activity
android:name=".MainActivity"
android:name="ms.warpzone.warppay.MainActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:windowSoftInputMode="stateVisible"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.nfc.action.TECH_DISCOVERED" />
</intent-filter>
<intent-filter>
<action android:name="android.nfc.action.TAG_DISCOVERED"/>
</intent-filter>
</activity>
</application>
</manifest>
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java deleted 100644 → 0
View file @ e6bcd116
package ms.itsecteam.warpdrink;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import java.util.ArrayList;
import ms.itsecteam.warpdrink.data.User;
import ms.itsecteam.warpdrink.dialogs.ChargeDialog;
import ms.itsecteam.warpdrink.dialogs.NewUserDialog;
import ms.itsecteam.warpdrink.orderList.ListViewAdapter;
import ms.itsecteam.warpdrink.orderList.Order;
public class MainActivity extends ActionBarActivity implements View.OnClickListener, View.OnKeyListener, AdapterView.OnItemClickListener, DialogInterface.OnClickListener {
private Button btnPay, btnCharge, btnLogout;
private ImageButton btnRefresh;
private TextView txtSum,txtCredit;
private ListView lstOrdered;
private AutoCompleteTextView atxvName;
private ListViewAdapter lstAdapter;
private ArrayAdapter atxvAdapter;
private ArrayList<Double> order;
private User currentUser;
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_main, menu);
return true;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
User.deleteAll();
new User(2, "hans", 100.0).save();
new User(3, "meier", 10.0).save();
new User(3, "merten", 1.0).save();
new User(4, "dieter", 1.0).save();
new User(5, "detlef", 0.5).save();
getWindow().addFlags(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
// getSupportActionBar().hide();
setContentView(R.layout.activity_main);
this.txtSum = (TextView) findViewById(R.id.txtSum);
this.txtCredit = (TextView)findViewById(R.id.txtCredit);
this.txtCredit.setText(getResources().getString(R.string.credit,0.0));
this.txtSum.setText(getResources().getString(R.string.total,0.0));
this.btnLogout = (Button) findViewById(R.id.btnLogout);
this.btnRefresh = (ImageButton) findViewById(R.id.btnRefresh);
this.btnPay = (Button) findViewById(R.id.btnPay);
this.btnCharge = (Button) findViewById(R.id.btnCharge);
this.lstAdapter = new ListViewAdapter(this, R.layout.order_list_item, new ArrayList<Order>());
this.lstOrdered = (ListView) findViewById(R.id.lstOrdered);
this.lstOrdered.setAdapter(this.lstAdapter);
this.atxvAdapter = new ArrayAdapter(this, android.R.layout.select_dialog_item, User.getAll());
this.atxvName = (AutoCompleteTextView) findViewById(R.id.atxvName);
this.atxvName.setAdapter(atxvAdapter);
this.atxvName.setThreshold(1);
this.atxvName.setOnKeyListener(this);
this.atxvName.setOnItemClickListener(this);
this.btnLogout.setVisibility(View.INVISIBLE);
this.enableControls(false);
}
private void setCurrentUser(User user) {
if (user != null) {
this.enableControls(true);
this.atxvName.dismissDropDown();
this.btnLogout.setVisibility(View.VISIBLE);
this.txtCredit.setText(getResources().getString(R.string.credit,user.getCredit()));
this.currentUser = user;
}
}
public User getCurrentUser() {
return this.currentUser;
}
private void clearCurrentUser() {
this.atxvName.setText("");
this.lstAdapter.clear();
this.enableControls(false);
this.btnLogout.setVisibility(View.INVISIBLE);
this.txtCredit.setText(getResources().getString(R.string.credit, 0.0));
this.txtSum.setText(getResources().getString(R.string.total, 0.0));
this.currentUser = null;
}
private void enableControls(boolean enable) {
this.atxvName.setEnabled(!enable);
this.btnRefresh.setEnabled(!enable);
this.btnCharge.setEnabled(enable);
this.btnPay.setEnabled(enable);
this.btnLogout.setEnabled(enable);
}
private double getTotal() {
double ret=0.0;
for (int i=0;i<this.lstAdapter.getCount();i++) {
ret += this.lstAdapter.getItem(i).getValue();
}
return ret;
}
private void refreshTotalTextView() {
this.txtSum.setText(getResources().getString(R.string.total,this.getTotal()));
}
public void refreshCreditTextView() {
this.txtCredit.setText(getResources().getString(R.string.credit,this.currentUser.getCredit()));
}
public void removeOrderOnClickHandler(View v) {
Order itemToRemove = (Order) v.getTag();
this.lstAdapter.remove(itemToRemove);
refreshTotalTextView();
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.btnOneEuro:
this.lstAdapter.insert(new Order(1.0), this.lstAdapter.getCount());
refreshTotalTextView();
break;
case R.id.btnFiftyCent:
this.lstAdapter.insert(new Order(0.5), this.lstAdapter.getCount());
refreshTotalTextView();
break;
case R.id.btnCharge:
new ChargeDialog(this).show();
break;
case R.id.btnPay:
double total = this.getTotal();
if (total > 0.0){
if (this.currentUser.getCredit()>=total){
new AlertDialog.Builder(this)
.setTitle(getResources().getString(R.string.confirm_payment_title))
.setMessage(getResources().getString(R.string.confirm_payment, total))
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
}
})
.setIcon(android.R.drawable.ic_dialog_alert)
.show();
} else {
Toast.makeText(this,getResources().getString(R.string.please_charge),Toast.LENGTH_LONG).show();
}
}
break;
case R.id.btnLogout:
clearCurrentUser();
break;
case R.id.btnAddUser:
new NewUserDialog(this).show();
break;
case R.id.btnRefresh:
Toast.makeText(this,"refresh" ,Toast.LENGTH_LONG).show();
break;
}
}
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction()==KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
if(this.atxvAdapter.getCount() == 1) {
setCurrentUser((User) this.atxvAdapter.getItem(0));
this.atxvName.setText(this.atxvAdapter.getItem(0).toString());
}
setCurrentUser(User.getByName(this.atxvName.getText().toString()));
return true;
}
return false;
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
setCurrentUser((User) this.atxvAdapter.getItem(position));
}
@Override
public void onClick(DialogInterface dialog, int which) {
this.currentUser.setCredit(this.currentUser.getCredit()-this.getTotal());
this.currentUser.save();
this.clearCurrentUser();
}
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_settings:
Toast.makeText(this, "Settings selected", Toast.LENGTH_SHORT).show();
break;
case R.id.action_new_user:
new NewUserDialog(this).show();
break;
default:
break;
}
return true;
}
}
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/DataApi.java deleted 100644 → 0
View file @ e6bcd116
package ms.itsecteam.warpdrink.data;
/**
* Created by Chris on 27.06.2015.
*/
public class DataApi {
public static boolean addUser(String name) {
if(User.getByName(name) == null) {
User u = new User();
u.setName(name);
u.save();
remoteSaveNewUser(u);
localRefreshUserData();
return true;
}
return false;
}
public static void localRefreshUserData() {
}
private static boolean remoteSaveNewUser(User u) {
return true;
}
public static User remoteGetUser(int userid) {
return new User();
}
}
WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java 0 → 100644
View file @ a73494b9
package ms.warpzone.warppay;
import android.app.AlertDialog;
import android.app.PendingIntent;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.nfc.NfcAdapter;
import android.nfc.tech.NfcF;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.PopupMenu;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import ms.warpzone.warppay.data.models.local.Product;
import ms.warpzone.warppay.data.models.local.User;
import ms.warpzone.warppay.dialogs.BarcodeLearnDialog;
import ms.warpzone.warppay.manager.DataManager;
import ms.warpzone.warppay.manager.MainManager;
import ms.warpzone.warppay.manager.RefreshManager;
import ms.warpzone.warppay.manager.UiManager;
import ms.warpzone.warppay.orderList.Order;
public class MainActivity extends AppCompatActivity implements View.OnClickListener, View.OnKeyListener, PopupMenu.OnMenuItemClickListener {
private MainManager manager;
private NfcAdapter nfcAdapter;
private PendingIntent mPendingIntent;
private IntentFilter[] mIntentFilters;
private String[][] mNFCTechLists;
private String barcode;
private BarcodeLearnDialog barcodeLearnDialog;
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_main, menu);
return true;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().addFlags(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
setContentView(R.layout.activity_main);
this.findViewById(R.id.mainLayout).setOnKeyListener(this);
this.manager = MainManager.getInstance();
this.manager.init(this);
this.barcode = "";
this.findViewById(android.R.id.content).setOnKeyListener(this);
this.nfcAdapter = NfcAdapter.getDefaultAdapter(this);
this.mPendingIntent = PendingIntent.getActivity(this, 0,
new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
IntentFilter ndefIntent = new IntentFilter(NfcAdapter.ACTION_TAG_DISCOVERED);
try {
this.mIntentFilters = new IntentFilter[] { ndefIntent };
} catch (Exception e) {
Log.e("TagDispatch", e.toString());
}
mNFCTechLists = new String[][] { new String[] { NfcF.class.getName() } };
}
public void onResume() {
super.onResume();
if (nfcAdapter != null) {
nfcAdapter.enableForegroundDispatch(this, mPendingIntent, mIntentFilters, mNFCTechLists);
}
}
@Override
public void onPause() {
super.onPause();
if (nfcAdapter != null)
nfcAdapter.disableForegroundDispatch(this);
}
protected void onNewIntent(Intent intent) {
String card_id = byteArrayToHex(intent.getByteArrayExtra(NfcAdapter.EXTRA_ID));
DataManager.getInstance().setLastCardId(card_id);
if(this.manager.getCurrentUser() == null) {
User u = User.getByCardId(card_id);
if(u != null)
MainManager.getInstance().setCurrentUser(u,true);
}
}
@Override
public void onUserInteraction(){
if(MainManager.getInstance().getCurrentUser() != null) {
RefreshManager.getInstance().startTimer();
//MainManager.getInstance().stopScreenSaverTimer();
} else {
RefreshManager.getInstance().stopTimer();
//MainManager.getInstance().resetScreenSaverTimer();
}
}
public static String byteArrayToHex(byte[] a) {
StringBuilder sb = new StringBuilder(a.length * 2);
for(byte b: a)
sb.append(String.format("%02x", b & 0xff));
return sb.toString();
}
public void onClick(View v) {
UiManager.getInstance().onClick(v);
}
@Override
public boolean onMenuItemClick(MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.action_learn_card_id:
RefreshManager.getInstance().stopTimer();
if (this.manager.getCurrentUser() != null){
new AlertDialog.Builder(this)
.setTitle(this.getResources().getString(R.string.confirm_learn_card))
.setMessage("Bitte die Karte vorhalten und nach dem Ton auf ok drücken.")
.setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
MainManager.getInstance().saveCardId();
}
})
.setIcon(android.R.drawable.ic_dialog_alert)
.show();
} else {
Toast.makeText(this, "Bitte User auswählen", Toast.LENGTH_LONG).show();
}
break;
case R.id.action_learn_barcode:
RefreshManager.getInstance().stopTimer();
this.barcodeLearnDialog = new BarcodeLearnDialog();
MainManager.getInstance().setBarcodeLearning(true);
this.barcodeLearnDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
MainManager.getInstance().setBarcodeLearning(false);
}
});
this.barcodeLearnDialog.show();
break;
default:
break;
}
return true;
}
public void removeOrderOnClickHandler(View v) {
MainManager.getInstance().removeOrder((Order) v.getTag());
}
@Override
public boolean onKey(View view, int keyCode, KeyEvent keyEvent) {
return false;
}
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
List blockedKeys = new ArrayList(Arrays.asList(KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_UP));
if (blockedKeys.contains(event.getKeyCode())) {
return true;
}
if(this.manager.getCurrentUser() != null) {
if (event.getAction() == KeyEvent.ACTION_UP) {
if (KeyEvent.KEYCODE_ENTER == event.getKeyCode()) {
Product p = Product.getOneByBarcode(this.barcode.trim().replace("\n", "").toString());
if (p != null) {
Order order = new Order(p);
UiManager.getInstance().addOrder(order);
this.manager.addOrder(order);
} else {
Toast.makeText(this, "Barcode not found: " + this.barcode, Toast.LENGTH_LONG).show();
}
this.barcode = "";
} else {
this.barcode += (char) event.getUnicodeChar();
}
}
}
return super.dispatchKeyEvent(event);
}
@Override
public void onBackPressed() {
// nothing to do here
// … really
}
}