Non admin users (#281)

* Fixes app crash if audioFile is Null (#260) * fix app crash if audioFile is Null * adds api-19 to travis.yml * resolve TransactionTooLargeException on android 7 * initial cast files * add app icon * updates logo and css for cast receiver * Adds Chromecast functionality (#273) * Chromecast support (#266) * resolve TransactionTooLargeException on android 7 * adds chromecast support * adds cast session manager and remote media to native player * adds ExpandedController for cast * resolve blank video activity on stopping cast * adds mini controller * adds cast notifications and change app id * resolve crash on opening cast activity through notification * adds cast support for audio files * start casting only after metadata is fetched * adds fixed image audio cast * shift chromecast app_id in api.properties * remove custom audio-play image * adds cast options to image viewer (#269) * New apis for upload & delete and auto upload feature (#272) * Upload and Delete file api and implementation (#242) * feat: adds delete file functionality * fix: change api route for file delete * adds basic file upload functionality * fix image null pointer error and switch to query params * adds file upload progress event * adds permission handler before uploading files * adds check for duplicate file upload * fix file not found bug * adds feature to upload video files too * refactor code * adds bottom sheet for displaying upload options * adds upload click listeners and callbacks in ServerFilesActivity * implements camera upload functionality * minor fixes and code clean up * removes upload icon from title bar * fix: forwarding to the desired action after grating permissions * feature to add custom hda servers from json * add debug file * resolve crash on uploading files from movies share * Fixed the landscape bottomSheet hidden by default bug. (#257) * Fixed the landscape bottomSheet hidden by default bug. * Adds android-19 to the travis.yml. * Auto upload feature (#253) * adds auto upload settings to preference screen * adds NEW_PICTURE broadcast receiver * adds upload service * adds upload settings preference fragment * adds hda and share list fetching to upload settings * adds sqlite db for storing image paths * adds custom upload queue * implements upload manager and server connection in background service * fix the UI stuck on file uploads * fix multiple files uploading at the same time * code refactoring * adds upload only on wifi preference option * adds api-19 to travis.yml * adds Job for tracking changes in images content uri * adds job scheduling to the application class * adds net connnectivity job * adds permission checker to auto upload settings * resolve TransactionTooLargeException on android 7 * Added code to delete file if it already exists. (#277) * Fixes app crash if audioFile is Null (#260) * fix app crash if audioFile is Null * adds api-19 to travis.yml * initial cast files * add app icon * updates logo and css for cast receiver * Added code to delete file if it already exists. * Update Downloader.java * Update Downloader.java * 2.9.2 release in beta channel * Made CastOptionsProvider class public * beta channel release 2.9.3 * reindented code and added .editorconfig (#279) * Use FileProvider to get file URI for API 24+ (#280) * bump to 2.9.4 for release
amahi · Oct 18, 2017 · d464921 · d464921
1 parent 768d04e
commit d464921
Show file tree

Hide file tree

Showing 170 changed files with 9,336 additions and 5,784 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# It's recommended to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/DEBUG.md b/DEBUG.md
@@ -0,0 +1,24 @@
+# Debugging
+
+Sometimes you may need to debug with some special purpose server. To do that, add a file like this
+
+ src/main/assets/customServers.json
+
+with details of the custom server(s) you need, like this:
+
+ ```
+  [
+    {
+      "name": "Test Server 1",
+      "session_token": "12345678901234567",
+      "local_address": "http://192.168.0.11:4563",
+      "remote_address": "http://192.168.12.22:4563"
+    },
+    {
+      "name": "Test Server 2",
+      "session_token": "12345678901234567",
+      "local_address": "http://192.168.0.11:4563",
+      "remote_address": "http://192.168.12.22:4563"
+    }
+  ]
+ ```
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ android {
     defaultConfig {
         def versionMajor = 2
         def versionMinor = 9
-        def versionPatch = 0
+        def versionPatch = 4
 
         versionName buildVersionName(versionMajor, versionMinor, versionPatch)
         versionCode buildVersionCode(versionMajor, versionMinor, versionPatch)
@@ -64,6 +64,7 @@ android {
         buildConfigField "String", "API_URL_PROXY", formatStringField(apiProperties["url.proxy"])
         buildConfigField "String", "API_CLIENT_ID", formatStringField(apiProperties["client.id"])
         buildConfigField "String", "API_CLIENT_SECRET", formatStringField(apiProperties["client.secret"])
+        buildConfigField "String", "CHROMECAST_APP_ID", formatStringField(apiProperties["chromecast.app.id"])
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -99,6 +100,7 @@ def formatStringField(field) {
 
 dependencies {
     repositories {
+        jcenter()
         mavenCentral()
         mavenLocal()
         maven { url 'https://maven.fabric.io/public' }
@@ -116,6 +118,8 @@ dependencies {
     compile "com.android.support:preference-v7:${SUPPORT_LIBRARY_VERSION}"
     compile "com.android.support:customtabs:${SUPPORT_LIBRARY_VERSION}"
     compile "com.android.support:leanback-v17:${SUPPORT_LIBRARY_VERSION}"
+    compile "com.android.support:mediarouter-v7:${SUPPORT_LIBRARY_VERSION}"
+    compile 'com.google.android.gms:play-services-cast-framework:11.0.2'
     compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
         transitive = true;
     }
@@ -130,6 +134,7 @@ dependencies {
     compile 'com.squareup.retrofit2:converter-gson:2.2.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
     compile 'org.videolan:libvlc:2.1.1'
+    compile 'pub.devrel:easypermissions:0.4.2'
     testCompile 'org.robolectric:robolectric:3.1.2'
     testCompile 'junit:junit:4.12'
     testCompile 'org.robolectric:shadows-multidex:3.0'

diff --git a/cast/README.md b/cast/README.md
@@ -0,0 +1 @@
+# Chromecast styled receiver support files
diff --git a/cast/amahi_app_icon.png b/cast/amahi_app_icon.png
diff --git a/cast/amahi_cast_logo.png b/cast/amahi_cast_logo.png
diff --git a/cast/amahi_cast_splash.png b/cast/amahi_cast_splash.png
diff --git a/cast/amahi_cast_watermark.png b/cast/amahi_cast_watermark.png
diff --git a/cast/style.css b/cast/style.css
@@ -0,0 +1,20 @@
+.logo {
+  background-image: url(amahi_cast_logo.png);
+  background-size: auto 10%;
+  background-color: white;
+}
+
+.splash {
+  background-image: url(amahi_cast_splash.png);
+  box-shadow: inset 0 0 0.1em 0.1em #000;
+  background-color: white;
+}
+
+.watermark {
+  background-image: url(amahi_cast_watermark.png);
+  background-size: auto 57px;
+}
+
+.placeholderImage {
+  background-size: contain;
+}
diff --git a/fakeApi.properties b/fakeApi.properties
@@ -1,8 +1,8 @@
 # Set API information in api.properties.
 # This is something to keep private and you obtain it by asking in the Amahi IRC channel or
 # send a message to support at Amahi dot org
-
 url.amahi=https://amahi.org
 url.proxy=https://amahi.org
 client.id=1234567890
 client.secret=abcdefghijklmnopqrstuvwxyz
+chromecast.app.id=CC1AD845
diff --git a/fakeSigning.properties b/fakeSigning.properties
@@ -1,7 +1,6 @@
 # Set API information in api.properties.
 # This is something to keep private and you obtain it by asking in the Amahi IRC channel or
 # send a message to support at Amahi dot org
-
 keystore.file=debug.keystore
 keystore.password=android
 key.alias=androiddebugkey

diff --git a/src/androidTest/java/org/amahi/anywhere/activity/AuthenticationActivityTest.java b/src/androidTest/java/org/amahi/anywhere/activity/AuthenticationActivityTest.java
@@ -20,18 +20,18 @@
 public class AuthenticationActivityTest {
     @Rule
     public ActivityTestRule<AuthenticationActivity> authenticationActivityTestRule =
-            new ActivityTestRule(AuthenticationActivity.class);
+        new ActivityTestRule(AuthenticationActivity.class);
 
     @Test
     public void testIsErrorMessageDisplayed_UsernameOrPasswordIsEmpty() {
         onView(withId(R.id.username_layout)).check(matches(isDisplayed()));
         onView(withId(R.id.password_layout)).check(matches(isDisplayed()));
 
         onView(withId(R.id.button_authentication))
-                .check(matches(isDisplayed()))
-                .perform(click());
+            .check(matches(isDisplayed()))
+            .perform(click());
 
         onView(withId(R.id.text_message_authentication_empty))
-                .check(matches(isDisplayed()));
+            .check(matches(isDisplayed()));
     }
 }