-버전업데이트

-옥수수 프로그램 정보 가져오는 중에 크래쉬 수정
-비디오 정보 가져오기, 로그인시에 예외 처리 강화

Author: PYTHONKOR

Source/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.ksi.alltv"
         minSdkVersion 23
         targetSdkVersion 26
-        versionCode 6
-        versionName "1.6"
+        versionCode 7
+        versionName "1.7"
     }
     buildTypes {
         release {

Source/app/src/main/java/com/ksi/alltv/FetchChannelService.java

@@ -90,7 +90,7 @@ protected void onHandleIntent(Intent intent) {
             int retCode;
             String authKey = mSiteProcessor.getAuthKey();
 
-            if(authKey == null || authKey.length() == 0) {
+            if (authKey == null || authKey.length() == 0 || channels.size() == 0 || category.size() == 0) {
                 retCode = Utils.Code.ServiceIntent_Fail.ordinal();
             } else {
                 retCode = Utils.Code.ServiceIntent_OK.ordinal();

Source/app/src/main/java/com/ksi/alltv/OksusuRowSupportFragment.java

@@ -208,7 +208,7 @@ protected Integer doInBackground(Integer... channelIndex) {
                 playVideo(chList.get(arrIndex), progInfo);
 
                 return Utils.Code.FetchVideoUrlTask_OK.ordinal();
-            } catch (java.lang.ArithmeticException ex) {
+            } catch (Exception ex) {
                 return Utils.Code.NoVideoUrl_err.ordinal();
             } finally {
 

Source/app/src/main/java/com/ksi/alltv/OksusuSiteProcessor.java

@@ -98,14 +98,19 @@ private void getLiveTvList() {
 
                 ChannelData chData = new ChannelData();
 
-                String channelName = Utils.removeQuote(channelObj.get(getAppDataString(R.string.CHANNELNAME_TAG)).getAsString());
-
-                chData.setTitle(channelName);
+                if (!channelObj.get(getAppDataString(R.string.CHANNELNAME_TAG)).isJsonNull()) {
+                    String channelName = Utils.removeQuote(channelObj.get(getAppDataString(R.string.CHANNELNAME_TAG)).getAsString());
+                    chData.setTitle(channelName);
+                }
 
-                JsonArray programs = channelObj.getAsJsonArray(getAppDataString(R.string.PROGRAMS_TAG));
-                String programName = Utils.removeQuote(programs.get(0).getAsJsonObject().get(getAppDataString(R.string.PROGRAMNAME_TAG)).getAsString());
+                if (!channelObj.getAsJsonArray(getAppDataString(R.string.PROGRAMS_TAG)).isJsonNull()) {
+                    JsonArray programs = channelObj.getAsJsonArray(getAppDataString(R.string.PROGRAMS_TAG));
 
-                chData.setProgram(programName);
+                    if (programs.size() > 0 && !programs.get(0).getAsJsonObject().get(getAppDataString(R.string.PROGRAMNAME_TAG)).isJsonNull()) {
+                        String programName = Utils.removeQuote(programs.get(0).getAsJsonObject().get(getAppDataString(R.string.PROGRAMNAME_TAG)).getAsString());
+                        chData.setProgram(programName);
+                    }
+                }
 
                 String stillImageUrl = Utils.removeQuote(channelObj.get(getAppDataString(R.string.STILLIMAGE_TAG)).getAsString());
 
@@ -134,7 +139,7 @@ private void getLiveTvList() {
 
                 mCategoryDatas.add(ctData);
             }
-        } catch (java.lang.ArithmeticException ex) {
+        } catch (Exception ex) {
             mChannelDatas.clear();
             mCategoryDatas.clear();
         } finally {
@@ -170,7 +175,7 @@ private void doLogin(SettingsData inSettingsData) {
                 mAuthKey = receivedCookies.substring(receivedCookies
                         .lastIndexOf(getAppDataString(R.string.CORNAC_STR)), receivedCookies.lastIndexOf(getAppDataString(R.string.DOMAIN_STR)));
             }
-        } catch (java.lang.ArithmeticException ex) {
+        } catch (Exception ex) {
             mAuthKey = "";
         } finally {
 

Source/app/src/main/java/com/ksi/alltv/PooqRowSupportFragment.java

@@ -233,7 +233,7 @@ protected Integer doInBackground(Integer... channelIndex) {
                 playVideo(chList.get(arrIndex), progInfo);
 
                 return Utils.Code.FetchVideoUrlTask_OK.ordinal();
-            } catch (java.lang.ArithmeticException ex) {
+            } catch (Exception ex) {
                 return Utils.Code.NoVideoUrl_err.ordinal();
             } finally {
 

Source/app/src/main/java/com/ksi/alltv/PooqSiteProcessor.java

@@ -123,7 +123,7 @@ private void getLiveTvList() {
                     mChannelDatas.add(chData);
                 }
             }
-        } catch (java.lang.ArithmeticException ex) {
+        } catch (Exception ex) {
             mChannelDatas.clear();
             mCategoryDatas.clear();
         } finally {
@@ -161,7 +161,7 @@ private void doLogin(SettingsData inSettingsData) {
             mAuthKey = Utils.removeQuote(parser.parse(resultJson).getAsJsonObject().
                     get(getAppDataString(R.string.RESULT_STR)).getAsJsonObject().
                     get(getAppDataString(R.string.POOQ_CREDENTIAL_STR)).getAsString());
-        } catch (java.lang.ArithmeticException ex) {
+        } catch (Exception ex) {
             mAuthKey = "";
         } finally {
 

Source/version.json

@@ -1,3 +1,3 @@
 { 
-	"PatchedVersion": "1.6"
+	"PatchedVersion" : "1.7"
 }