update backup channels url

Author: cy8018

app/src/main/java/com/cy8018/tvplayer/ui/MainActivity.java

@@ -6,30 +6,25 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.pm.ActivityInfo;
 import android.net.TrafficStats;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.SearchView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -69,7 +64,6 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.zip.GZIPInputStream;
 
 import okhttp3.OkHttpClient;
@@ -1021,12 +1015,12 @@ public void run() {
                     }
                 });
 
-                return getJsonString2(getResources().getString(R.string.iptv_station_list2));
+                return getJsonStringBackup(getResources().getString(R.string.tv_channel_list_backup));
             }
         }
 
         @Nullable
-        private String getJsonString2(String url) {
+        private String getJsonStringBackup(String url) {
             String jsonData = null;
             try {
                 InputStream stream = null;

app/src/main/java/com/cy8018/tvplayer/ui/SettingsFragment.java

@@ -81,10 +81,7 @@ else if (url.endsWith(".m3u") || url.endsWith(".m3u8")) {
         loadDefaultBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                Toast toast= Toast.makeText(getContext(), "Loading channels, please wait...", Toast.LENGTH_LONG);
-//                toast.setGravity(Gravity.CENTER, 0, 0);
-//                toast.show();
-                ((MainActivity)getActivity()).loadChannelList(getResources().getString(R.string.iptv_station_list));
+                ((MainActivity)getActivity()).loadChannelList(getResources().getString(R.string.tv_channel_list));
             }
         });
 

app/src/main/res/values/strings.xml

@@ -5,9 +5,10 @@
     <string name="email_copyright">[email protected] ©2020</string>
 
     <string name="station_list_file_name">tv_station_list.json</string>
-<!--<string name="iptv_station_list">https://github.com/cy8018/Resources/raw/master/tv/channels.json.gz</string>-->
-    <string name="iptv_station_list">https://iptv-org.github.io/iptv/channels.json</string>
-    <string name="iptv_station_list2">https://gitee.com/cy8018/Resources/raw/master/tv/channels.json.gz</string>
+<!--<string name="tv_channel_list">https://github.com/cy8018/Resources/raw/master/tv/channels.json.gz</string>-->
+<!--<string name="tv_channel_list_backup">https://gitee.com/cy8018/Resources/raw/master/tv/channels.json.gz</string>-->
+    <string name="tv_channel_list">https://iptv-org.github.io/iptv/channels.json</string>
+    <string name="tv_channel_list_backup">https://github.com/cy8018/Resources/raw/master/tv/channels.json.gz</string>
 
     <string name="loading">Loading…</string>
     <string name="search_hint"> Name/Country/Language…</string>