Skip to content

Commit aefee24

Browse files
author
Chris Bellew
committed
Merged Server/Client scanning and moved it out of Activities and into its own Service.
1 parent f808daf commit aefee24

File tree

14 files changed

+550
-559
lines changed

14 files changed

+550
-559
lines changed

Voice Control For Plex/Voice Control For Plex.iml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<configuration>
66
<option name="SELECTED_BUILD_VARIANT" value="debug" />
77
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
8-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
8+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
99
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1010
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1111
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
@@ -31,11 +31,13 @@
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3941
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4143
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -77,6 +79,7 @@
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
7981
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8083
</content>
8184
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
8285
<orderEntry type="sourceFolder" forTests="false" />
@@ -93,6 +96,7 @@
9396
<orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />
9497
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
9598
<orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
99+
<orderEntry type="library" exported="" name="1_commons-io-1.3.2" level="project" />
96100
<orderEntry type="module" module-name="CastCompanionLibrary-android" exported="" />
97101
</component>
98102
</module>

Voice Control For Plex/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android {
3434
release {
3535
signingConfig signingConfigs.release
3636
debuggable false
37-
runProguard false
37+
minifyEnabled false
3838
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
3939
buildConfigField "boolean", "USE_BUGSENSE", "true"
4040
buildConfigField "boolean", "CHROMECAST_REQUIRES_PURCHASE", "true"
@@ -51,7 +51,7 @@ android {
5151
chromecast {
5252
signingConfig signingConfigs.release
5353
debuggable true
54-
runProguard false
54+
minifyEnabled false
5555
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
5656
buildConfigField "boolean", "USE_BUGSENSE", "false"
5757
buildConfigField "boolean", "CHROMECAST_REQUIRES_PURCHASE", "true"
@@ -61,7 +61,7 @@ android {
6161
chromecastTest {
6262
signingConfig signingConfigs.release
6363
debuggable true
64-
runProguard false
64+
minifyEnabled false
6565
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
6666
buildConfigField "boolean", "USE_BUGSENSE", "false"
6767
buildConfigField "boolean", "CHROMECAST_REQUIRES_PURCHASE", "true"

Voice Control For Plex/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@
7474
<action android:name="android.intent.action.MAIN"/>
7575
</intent-filter>
7676
</activity>
77+
<service
78+
android:name=".services.PlexScannerService"
79+
android:exported="false" />
7780
<service
7881
android:name=".GDMService"
7982
android:exported="false" />

Voice Control For Plex/src/main/java/com/atomjack/vcfp/LocalScan.java

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)