Fix merge errors, clean imports

R-a-dio · Jan 4, 2017 · 21ed924 · 21ed924
1 parent a47cf74
commit 21ed924
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 32 deletions.
diff --git a/app/src/main/java/io/r_a_d/radio/ActivityMain.java b/app/src/main/java/io/r_a_d/radio/ActivityMain.java
@@ -29,28 +29,9 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.w3c.dom.Text;
-
-<<<<<<< HEAD
-=======
-import com.google.android.exoplayer2.DefaultLoadControl;
-import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.LoadControl;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
-import com.google.android.exoplayer2.extractor.ExtractorsFactory;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelector;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.util.Util;
 
-import java.util.ArrayList;
->>>>>>> refs/remotes/origin/master
 import java.util.HashMap;
-import java.util.List;
+import java.util.ArrayList;
 
 public class ActivityMain extends AppCompatActivity implements ViewPager.OnPageChangeListener{
 
@@ -117,11 +98,7 @@ public void run() {
         });
         songCalcThread.setDaemon(true);
         songCalcThread.start();
-<<<<<<< HEAD
-=======
-
         mRequestor = new Requestor(this);
->>>>>>> refs/remotes/origin/master
     }
 
     @Override

diff --git a/app/src/main/java/io/r_a_d/radio/RadioService.java b/app/src/main/java/io/r_a_d/radio/RadioService.java
@@ -5,8 +5,6 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Build;

diff --git a/app/src/main/java/io/r_a_d/radio/Requestor.java b/app/src/main/java/io/r_a_d/radio/Requestor.java
@@ -1,7 +1,6 @@
 package io.r_a_d.radio;
 
 import android.os.AsyncTask;
-import android.text.Html;
 import android.util.Xml;
 import android.widget.Toast;
 
@@ -12,16 +11,12 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.CookieHandler;
 import java.net.CookieManager;
-import java.net.CookieStore;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

diff --git a/app/src/main/res/layout/news.xml b/app/src/main/res/layout/news.xml
@@ -42,7 +42,7 @@
             </FrameLayout>
 
             <TextView
-                android:text="Loading,,,"
+                android:text="Loading..."
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/news1"