Merged hotfix/appNotFunctioning into master

app/build.gradle

@@ -55,7 +55,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 24
         versionCode versionBuild
-        versionName "0.10.0"
+        versionName "0.10.1"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
     }

app/proguard-rules.pro

@@ -1,42 +1,24 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\Malik\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
+-dontobfuscate
+-dontwarn **
+-ignorewarnings
+-dontoptimize
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-keepattributes *
 
--dontwarn com.google.**
+-keep class de.m4lik.burningseries.** { *; }
 
--keep class com.squareup.okhttp.** { *; }
--keep class retrofit.** { *; }
--keep interface com.squareup.okhttp.** { *; }
+# keeps views and other stuff. Support library fails without this.
+-keep class android.support.v7.widget.SearchView { *; }
 
--dontwarn com.squareup.okhttp.**
--dontwarn okio.**
--dontwarn retrofit.**
--dontwarn rx.**
--dontwarn retrofit2.Platform$Java8
+# this is for butterknife
+-keep class **$$ViewBinder { *; }
 
--keepclasseswithmembers class * {
-    @retrofit.http.* <methods>;
-}
-
-# If in your rest service interface you use methods with Callback argument.
--keepattributes Exceptions
-
-# If your rest service methods throw custom exceptions, because you've defined an ErrorHandler.
--keepattributes Signature
-
--keep class com.wang.avi.** { *; }
--keep class com.wang.avi.indicators.** { *; }
+# keep enums!
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+    **[] $VALUES;
+    public *;
+}

app/src/main/java/de/m4lik/burningseries/ShowActivity.java

@@ -14,7 +14,6 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
@@ -26,9 +25,10 @@
 import butterknife.BindView;
 import de.m4lik.burningseries.api.API;
 import de.m4lik.burningseries.api.APIInterface;
+import de.m4lik.burningseries.api.objects.SeasonObj;
 import de.m4lik.burningseries.database.MainDBHelper;
 import de.m4lik.burningseries.database.SeriesContract;
-import de.m4lik.burningseries.api.objects.SeasonObj;
+import de.m4lik.burningseries.ui.base.ActivityBase;
 import de.m4lik.burningseries.ui.showFragments.EpisodesFragment;
 import de.m4lik.burningseries.ui.showFragments.HosterFragment;
 import de.m4lik.burningseries.ui.showFragments.SeasonsFragment;
@@ -39,7 +39,7 @@
 
 import static de.m4lik.burningseries.database.SeriesContract.seriesTable;
 
-public class ShowActivity extends AppCompatActivity implements Callback<SeasonObj> {
+public class ShowActivity extends ActivityBase implements Callback<SeasonObj> {
 
     private String title;
     private String description;
@@ -63,6 +63,11 @@ public class ShowActivity extends AppCompatActivity implements Callback<SeasonOb
 
     Intent i;
 
+    @Override
+    protected void injectComponent(ActivityComponent appComponent) {
+        appComponent.inject(this);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/version.properties

@@ -1,2 +1,2 @@
-#Sun Jan 29 21:56:06 CET 2017
-VERSION_BUILD=127
+#Mon Jan 30 01:40:21 CET 2017
+VERSION_BUILD=137