Skip to content

Commit 49b29e3

Browse files
committed
google play app download bug fixed
1 parent 61ced0f commit 49b29e3

File tree

4 files changed

+106
-152
lines changed

4 files changed

+106
-152
lines changed

bootpay/bootpay.iml

Lines changed: 48 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":bootpay" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.2" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.3.2" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -18,6 +20,7 @@
1820
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1921
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2022
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
2124
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2225
<option name="PROJECT_TYPE" value="1" />
2326
</configuration>
@@ -32,14 +35,14 @@
3235
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3336
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3437
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
3740
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3841
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
3942
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4043
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4346
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4447
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4548
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
@@ -69,89 +72,67 @@
6972
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7073
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7174
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7975
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8076
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8177
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8278
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8379
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8480
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8581
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
10990
</content>
110-
<orderEntry type="jdk" jdkName="Android API 26 Platform (1)" jdkType="Android SDK" />
91+
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
11192
<orderEntry type="sourceFolder" forTests="false" />
112-
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
113-
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
114-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.40@jar" level="project" />
115-
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.6.0@jar" level="project" />
116-
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.0.0@jar" level="project" />
93+
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
94+
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
95+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
96+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
97+
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
11798
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
118-
<orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.0@jar" level="project" />
99+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
100+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
119101
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
120-
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.0@jar" level="project" />
121-
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
122-
<orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
123-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
124-
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
125102
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
126-
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.8.0@jar" level="project" />
103+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
104+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
105+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
106+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31@jar" level="project" />
107+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.6.0@jar" level="project" />
108+
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
127109
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.6.0@jar" level="project" />
128-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
110+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.6.0@jar" level="project" />
111+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.6.0@jar" level="project" />
129112
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:4.0.0@jar" level="project" />
113+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.0.0@jar" level="project" />
114+
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.8.0@jar" level="project" />
115+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2@jar" level="project" />
116+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.40@jar" level="project" />
117+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
130118
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.0.0@jar" level="project" />
131-
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.0@aar" level="project" />
119+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.40@jar" level="project" />
132120
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
133-
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
134-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar" level="project" />
135-
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
136-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
137-
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:26.1.0@aar" level="project" />
138-
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
139-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31@jar" level="project" />
121+
<orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.0@jar" level="project" />
140122
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
141-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
142-
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2@jar" level="project" />
143-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.40@jar" level="project" />
123+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
144124
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:26.1.0@aar" level="project" />
145-
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar" level="project" />
146-
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:26.1.0@aar" level="project" />
147125
<orderEntry type="library" name="Gradle: com.github.franmontiel:PersistentCookieJar:v1.0.1@aar" level="project" />
126+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
127+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar" level="project" />
148128
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:26.1.0@aar" level="project" />
149-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
150-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
151-
<orderEntry type="library" name="Gradle: com.android.support:support-compat:26.1.0@aar" level="project" />
152-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
129+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar" level="project" />
130+
<orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
131+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.0@aar" level="project" />
132+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:26.1.0@aar" level="project" />
133+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:26.1.0@aar" level="project" />
153134
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:26.1.0@aar" level="project" />
154-
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar" level="project" />
155-
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.6.0@jar" level="project" />
135+
<orderEntry type="library" name="Gradle: com.android.support:support-compat:26.1.0@aar" level="project" />
136+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar" level="project" />
156137
</component>
157138
</module>

bootpay/src/main/java/kr/co/bootpay/BootpayWebView.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,16 @@ private boolean start(Intent intent, Context context) {
232232
}
233233

234234
private boolean gotoMarket(Intent intent, Context context) {
235-
context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + intent.getPackage())));
235+
final String appPackageName = intent.getPackage();
236+
if(appPackageName == null) {
237+
context.startActivity(new Intent(Intent.ACTION_VIEW, intent.getData()));
238+
return true;
239+
}
240+
try {
241+
context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName)));
242+
} catch (android.content.ActivityNotFoundException anfe) {
243+
context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName)));
244+
}
236245
return true;
237246
}
238247

0 commit comments

Comments
 (0)