Version 1.2

New provider.

Author: dbeqiraj

apk/YoutubeDownloader.apk

@@ -7,7 +7,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
-        versionName "1.1"
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/build.gradle

@@ -5,13 +5,14 @@
 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Path;
+import retrofit2.http.Query;
 
 /**
  * Created by d.beqiraj on 5/19/2018.
  */
 
 public interface VideoApiService {
 
-    @GET("/@api/json/mp3/{vidID}")
-    Observable<Video> getVideo(@Path("vidID") String vidID);
+    @GET("/ytconverter/convert.php")
+    Observable<Video> getVideo(@Query("youtubelink") String youtubelink);
 }

app/src/main/java/com/dbeqiraj/youtubedownloader/api/VideoApiService.java

@@ -33,7 +33,7 @@ private void initializeFresco() {
     private void initializeApplicationComponent() {
         mApplicationComponent = DaggerApplicationComponent
                 .builder()
-                .applicationModule(new ApplicationModule(this, "https://baixaryoutube.net"))
+                .applicationModule(new ApplicationModule(this, "http://michaelbelgium.me"))
                 .build();
     }
 

app/src/main/java/com/dbeqiraj/youtubedownloader/application/App.java

@@ -94,13 +94,7 @@ private void getVideo() {
             title = StringUtils.substringBetween(extras.getString(Intent.EXTRA_SUBJECT), "Watch \"", "\" on YouTube");
             String link = extras.getString(Intent.EXTRA_TEXT);
             if (link != null) {
-                int index = link.lastIndexOf("/") + 1;
-                if ( index > -1 ) {
-                    String id = link.substring(index);
-                    videoPresenter.getVideo(id);
-                } else {
-                    onShowToast(getString(R.string.invalid_link));
-                }
+                videoPresenter.getVideo(link);
             } else {
                 onShowToast(getString(R.string.invalid_link));
             }
@@ -117,7 +111,7 @@ public void onVideoInfoDownloaded(Video video) {
                 .replaceAll("\"", "_")
                 .replaceAll("&", "&");
 
-        video.setVidTitle(title);
+        video.setTitle(title);
 
         Intent intent = new Intent(this, DownloadService.class);
         intent.putExtra("video", video);

app/src/main/java/com/dbeqiraj/youtubedownloader/modules/download/DownloadActivity.java

@@ -78,7 +78,7 @@ protected void onHandleIntent(@Nullable Intent intent) {
 
         notificationBuilder = new NotificationCompat.Builder(this, "")
                 .setSmallIcon(R.drawable.ic_download)
-                .setContentTitle(video.getVidTitle())
+                .setContentTitle(video.getTitle())
                 .setContentText(getString(R.string.download_started))
                 .setAutoCancel(true);
 
@@ -90,7 +90,7 @@ protected void onHandleIntent(@Nullable Intent intent) {
 
         notificationManager.notify(0, notificationBuilder.build());
 
-        initDownload(video.getVidInfo().get("0").getDloadUrl());
+        initDownload(video.getFile());
 
     }
 
@@ -109,7 +109,7 @@ private boolean writeResponseBodyToDisk(ResponseBody body) {
             }
 
             if ( root.exists() ) {
-                File file = new File(rootDir + File.separator + video.getVidTitle() + ".mp3");
+                File file = new File(rootDir + File.separator + video.getTitle() + ".mp3");
 
                 InputStream inputStream = null;
                 OutputStream outputStream = null;
@@ -153,7 +153,7 @@ private boolean writeResponseBodyToDisk(ResponseBody body) {
                     outputStream.flush();
 
                     // Music file
-                    Utils.isMusic(getApplicationContext(), file, video.getVidTitle());
+                    Utils.isMusic(getApplicationContext(), file, video.getTitle());
 
                     return true;
                 } catch (IOException e) {

app/src/main/java/com/dbeqiraj/youtubedownloader/modules/download/service/DownloadService.java

@@ -9,33 +9,40 @@
 
 public class Video implements Serializable {
 
-    private HashMap<String, VidInfo> vidInfo;
-    private String vidTitle;
-    private String vidID;
+    private Boolean error;
+    private String title;
+    private Long duration;
+    private String file;
 
-    public HashMap<String, VidInfo> getVidInfo() {
-        return vidInfo;
+    public Boolean getError() {
+        return error;
     }
 
-    public void setVidInfo(HashMap<String, VidInfo> vidInfo) {
-        this.vidInfo = vidInfo;
+    public void setError(Boolean error) {
+        this.error = error;
     }
 
-    public String getVidTitle() {
-        return vidTitle;
+    public String getTitle() {
+        return title;
     }
 
-    public void setVidTitle(String vidTitle) {
-        this.vidTitle = vidTitle;
+    public void setTitle(String title) {
+        this.title = title;
     }
 
-    public String getVidID() {
-        return vidID;
+    public Long getDuration() {
+        return duration;
     }
 
-    public void setVidID(String vidID) {
-        this.vidID = vidID;
+    public void setDuration(Long duration) {
+        this.duration = duration;
     }
 
+    public String getFile() {
+        return file;
+    }
 
+    public void setFile(String file) {
+        this.file = file;
+    }
 }

app/src/main/java/com/dbeqiraj/youtubedownloader/mvp/model/Video.java

@@ -28,9 +28,9 @@ public class VideoPresenter extends BasePresenter<DownloadView> implements Obser
     public VideoPresenter() {
     }
 
-    public void getVideo(String vidID) {
+    public void getVideo(String youtubelink) {
         getView().onStartVidInfDownload();
-        Observable<Video> cakesResponseObservable = mApiService.getVideo(vidID);
+        Observable<Video> cakesResponseObservable = mApiService.getVideo(youtubelink);
         subscribe(cakesResponseObservable, this);
     }