Update to HTSP lib v0.0.1a12

This includes a few more reliability fixes and cleaner error handling for common errors.
kiall · Feb 21, 2017 · 549ba00 · 549ba00
1 parent f532ae3
commit 549ba00
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -68,7 +68,7 @@ repositories {
 }
 
 dependencies {
-    compile 'ie.macinnes.htsp:android-htsp:v0.0.1a11'
+    compile 'ie.macinnes.htsp:android-htsp:v0.0.1a12'
     // Used for testing local HTSP lib builds
 //    compile(name: 'library-release', ext: 'aar')
     compile fileTree(include: ['*.jar'], dir: 'libs')

diff --git a/app/src/main/java/ie/macinnes/tvheadend/account/AuthenticatorActivity.java b/app/src/main/java/ie/macinnes/tvheadend/account/AuthenticatorActivity.java
@@ -384,6 +384,9 @@ public void onConnectionStateChange(@NonNull HtspConnection.State state) {
                 Bundle args = getArguments();
                 args.putString(Constants.KEY_ERROR_MESSAGE, "Failed to connect to HTSP server");
 
+                // Stop the connection
+                mConnection.stop();
+
                 // Move to the failed step
                 GuidedStepFragment fragment = new FailedFragment();
                 fragment.setArguments(args);
@@ -395,7 +398,7 @@ public void onConnectionStateChange(@NonNull HtspConnection.State state) {
         public void onAuthenticationStateChange(@NonNull Authenticator.State state) {
             if (state == Authenticator.State.AUTHENTICATED) {
                 // Close the connection, it's no longer needed
-                mConnection.closeConnection();
+                mConnection.stop();
 
                 // Store the account
                 final Account account = new Account(mAccountName, mAccountType);
@@ -422,6 +425,9 @@ public void onAuthenticationStateChange(@NonNull Authenticator.State state) {
             } else {
                 Log.w(TAG, "Failed to validate credentials");
 
+                // Stop the connection
+                mConnection.stop();
+
                 Bundle args = getArguments();
                 args.putString(Constants.KEY_ERROR_MESSAGE, "Failed to validate HTSP Credentials");
 

diff --git a/app/src/main/java/ie/macinnes/tvheadend/setup/TvInputSetupActivity.java b/app/src/main/java/ie/macinnes/tvheadend/setup/TvInputSetupActivity.java
@@ -394,7 +394,7 @@ public void onStart() {
 
         @Override
         public void onStop() {
-            mConnection.closeConnection();
+            mConnection.stop();
             super.onStop();
         }
 

diff --git a/app/src/main/java/ie/macinnes/tvheadend/sync/EpgSyncService.java b/app/src/main/java/ie/macinnes/tvheadend/sync/EpgSyncService.java
@@ -143,7 +143,7 @@ protected void initHtspConnection() {
     protected void closeConnection() {
         if (mConnection != null) {
             Log.d(TAG, "Closing HTSP connection");
-            mConnection.closeConnection();
+            mConnection.stop();
         }
 
         cleanupConnection();

diff --git a/app/src/main/java/ie/macinnes/tvheadend/tvinput/TvInputService.java b/app/src/main/java/ie/macinnes/tvheadend/tvinput/TvInputService.java
@@ -123,7 +123,7 @@ protected void initHtspConnection() {
     protected void closeConnection() {
         if (mConnection != null) {
             Log.d(TAG, "Closing HTSP connection");
-            mConnection.closeConnection();
+            mConnection.stop();
         }
 
         cleanupConnection();