added fabric crash reports and some dependency cleanup

Author: ov3rk1ll

.idea/gradle.xml

@@ -1,15 +1,27 @@
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
+
+repositories {
+    maven { url 'https://maven.fabric.io/public' }
+}
+
+
+def versionMajor = 1
+def versionMinor = 4
+def versionPatch = 2
+def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.2'
+    compileSdkVersion 24
+    buildToolsVersion '24.0.2'
 
     defaultConfig {
         applicationId "com.ov3rk1ll.kinocast"
         minSdkVersion 10
-        targetSdkVersion 23
-        versionName '1.4.0'
-        versionCode 1400
+        targetSdkVersion 24
+
+        versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
@@ -27,25 +39,37 @@ android {
 
         buildConfigField "boolean", "GMS_CHECK", "true"
         buildConfigField "boolean", "ENABLE_HELP", "false"
+
+        Properties properties = new Properties()
+        properties.load(project.rootProject.file('local.properties').newDataInputStream())
+        resValue "string", "fabric_mopub_key",properties.getProperty('FABRIC_MOPUB_KEY')
+        manifestPlaceholders = [ FABRIC_API_KEY: properties.getProperty('FABRIC_API_KEY')]
     }
     buildTypes {
         release {
+            //shrinkResources true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
-    //compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.2.0'
-    compile 'com.android.support:design:23.2.0'
-    compile 'com.google.android.gms:play-services:8.4.0'
-    compile 'com.android.support:recyclerview-v7:23.2.0'
-    compile 'com.android.support:palette-v7:23.2.0'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.android.support:design:24.2.0'
+    compile 'com.android.support:recyclerview-v7:24.2.0'
+    compile 'com.android.support:palette-v7:24.2.0'
     compile 'com.squareup.okhttp:okhttp:2.7.5'
-    compile 'org.jsoup:jsoup:1.8.3'
-    compile 'com.google.android.libraries.cast.companionlibrary:ccl:2.8.2'
-    //compile project(':libs:ShowcaseView')
-    //compile project(':libs:CastCompanionLibrary-android')
-}
+    compile 'org.jsoup:jsoup:1.9.1'
+    compile 'com.google.android.libraries.cast.companionlibrary:ccl:2.8.4'
+    compile('com.mopub:mopub-sdk:4.8.0@aar') {
+        transitive = true;
+    }
+    compile('io.fabric.sdk.android:fabric:1.3.10@aar') {
+        transitive = true;
+    }
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
+        transitive = true;
+    }
+}

.idea/misc.xml

@@ -15,3 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+-dontwarn android.support.v7.**
+-keep class android.support.v7.** { *; }
+-keep interface android.support.v7.** { *; }

.idea/modules.xml

@@ -94,7 +94,19 @@
         </activity>
         <meta-data
             android:name="io.fabric.ApiKey"
-            android:value="9bfc76c431caa3d3368271ebf4c58936cbb5e74f" />
+            android:value="${FABRIC_API_KEY}" />
+        <activity
+            android:name="com.mopub.mobileads.MoPubActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name="com.mopub.mobileads.MraidActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name="com.mopub.common.MoPubBrowser"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name="com.mopub.mobileads.MraidVideoPlayerActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
     </application>
 
 </manifest>

app/app.iml

@@ -5,12 +5,11 @@
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.google.android.gms.analytics.GoogleAnalytics;
-import com.google.android.gms.analytics.Tracker;
+import com.crashlytics.android.Crashlytics;
 import com.ov3rk1ll.kinocast.api.KinoxParser;
 import com.ov3rk1ll.kinocast.api.Parser;
 
-import java.util.HashMap;
+import io.fabric.sdk.android.Fabric;
 
 public class TrackingApplication extends Application {
 
@@ -21,24 +20,6 @@ public void onCreate() {
         Parser.selectParser(preferences.getInt("parser", KinoxParser.PARSER_ID));
         Log.i("selectParser", "ID is " + Parser.getInstance().getParserId());
         super.onCreate();
-    }
-
-    public enum TrackerName {
-        APP_TRACKER, // Tracker used only in this app.
-        GLOBAL_TRACKER, // Tracker used by all the apps from a company. eg: roll-up tracking.
-        ECOMMERCE_TRACKER, // Tracker used by all ecommerce transactions from a company.
-    }
-
-    HashMap<TrackerName, Tracker> mTrackers = new HashMap<TrackerName, Tracker>();
-
-    public synchronized Tracker getTracker(TrackerName trackerId) {
-        if (!mTrackers.containsKey(trackerId)) {
-            GoogleAnalytics analytics = GoogleAnalytics.getInstance(this);
-            Tracker t = analytics.newTracker(getString(R.string.ga_trackingId));
-            t.enableAutoActivityTracking(true);
-            mTrackers.put(trackerId, t);
-
-        }
-        return mTrackers.get(trackerId);
+        Fabric.with(this, new Crashlytics());
     }
 }

app/build.gradle

@@ -19,7 +19,6 @@
 import org.jsoup.select.Elements;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,8 +30,8 @@ public class KinoxParser extends Parser{
     public static final int PARSER_ID = 0;
     public static final String URL_BASE = "http://www.kinox.tv/";
 
-    private static final SparseArray<Integer> languageResMap = new SparseArray<Integer>();
-    private static final SparseArray<String> languageKeyMap = new SparseArray<String>();
+    private static final SparseArray<Integer> languageResMap = new SparseArray<>();
+    private static final SparseArray<String> languageKeyMap = new SparseArray<>();
     static {
         languageResMap.put(1, R.drawable.lang_de); languageKeyMap.put(1, "de");
         languageResMap.put(2, R.drawable.lang_en); languageKeyMap.put(2, "de");
@@ -65,7 +64,7 @@ public int getParserId(){
     }
 
     private List<ViewModel> parseList(Document doc){
-        List<ViewModel> list = new ArrayList<ViewModel>();
+        List<ViewModel> list = new ArrayList<>();
         Elements files = doc.select("div.MiniEntry");
 
         for(Element element : files){
@@ -127,7 +126,7 @@ private ViewModel parseDetail(Document doc, ViewModel item){
             item.setSeriesID(Integer.valueOf(rel));
             // Fill seasons and episodes
             Elements seasons = doc.select("select#SeasonSelection > option");
-            List <Season> list = new ArrayList<Season>();
+            List <Season> list = new ArrayList<>();
             for(Element season : seasons){
                 String[] rels = season.attr("rel").split(",");
                 Season s = new Season();
@@ -139,7 +138,7 @@ private ViewModel parseDetail(Document doc, ViewModel item){
             item.setSeasons(list.toArray(new Season[list.size()]));
         }else{
             item.setType(ViewModel.Type.MOVIE);
-            List<Host> hostlist = new ArrayList<Host>();
+            List<Host> hostlist = new ArrayList<>();
             Elements hosts = doc.select("ul#HosterList").select("li");
             for(Element host: hosts){
                 int hosterId = 0;
@@ -249,7 +248,7 @@ public List<Host> getHosterList(ViewModel item, int season, String episode){
                     .timeout(10000)
                     .get();
 
-            List<Host> hostlist = new ArrayList<Host>();
+            List<Host> hostlist = new ArrayList<>();
             Elements hosts = doc.select("li");
             for(Element host: hosts){
                 int hosterId = Integer.valueOf(host.id().replace("Hoster_", ""));
@@ -279,7 +278,7 @@ public String getMirrorLink(DetailActivity.QueryPlayTask queryTask, String url){
         try {
             queryTask.updateProgress("Get host from " + URL_BASE + url);
             JSONObject json = Utils.readJson(URL_BASE + url);
-            Document doc = Jsoup.parse(json.getString("Stream"));
+            Document doc = Jsoup.parse(json != null ? json.getString("Stream") : null);
             String href = doc.select("a").attr("href");
             queryTask.updateProgress("Get video from " + href);
             return href;
@@ -299,27 +298,29 @@ public String getMirrorLink(DetailActivity.QueryPlayTask queryTask, ViewModel it
         return getMirrorLink(queryTask, "aGET/Mirror/" + item.getSlug() + "&Hoster=" + hoster + "&Mirror=" + mirror + "&Season=" + season + "&Episode=" + episode);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public String[] getSearchSuggestions(String query){
         String url = URL_BASE + "aGET/Suggestions/?q=" + URLEncoder.encode(query) + "&limit=10&timestamp=" + SystemClock.elapsedRealtime();
         String data = Utils.readUrl(url);
-        try {
+        /*try {
             byte ptext[] = data.getBytes("ISO-8859-1");
             data = new String(ptext, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
-        }
-        String suggestions[] = data.split("\n");
+        }*/
+        String suggestions[] = data != null ? data.split("\n") : new String[0];
         if(suggestions[0].trim().equals("")) return null;
-        // TODO Remove duplicates
-        return new HashSet<String>(Arrays.asList(suggestions)).toArray(new String[0]);
+        // Remove duplicates
+        return new HashSet<>(Arrays.asList(suggestions)).toArray(new String[new HashSet<>(Arrays.asList(suggestions)).size()]);
     }
 
     @Override
     public String getPageLink(ViewModel item){
         return URL_BASE + "Stream/" + item.getSlug() + ".html";
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public String getSearchPage(String query){
         return URL_BASE + "Search.html?q=" + URLEncoder.encode(query);