Merge pull request #120 from lgallard/testing

Testing
lgallard · Nov 18, 2016 · d8b59f6 · d8b59f6
2 parents 5595a01 + 128aaf5
commit d8b59f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -166,6 +166,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -41,18 +41,18 @@ android {
     productFlavors {
         pro {
             applicationId 'com.lgallardo.qbittorrentclientpro'
-            versionName '4.4.5'
+            versionName '4.4.6'
             minSdkVersion 14
             targetSdkVersion 23
-            versionCode 445
+            versionCode 446
             archivesBaseName = "qBittorrentController_v" + versionName
         }
         free {
             applicationId "com.lgallardo.qbittorrentclient"
-            versionName '4.4.5'
+            versionName '4.4.6'
             minSdkVersion 14
             targetSdkVersion 23
-            versionCode 445
+            versionCode 446
         }
     }
 

diff --git a/app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java b/app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java
@@ -328,8 +328,6 @@ protected void onCreate(Bundle savedInstanceState) {
         // Get preferences
         getSettings();
 
-        MainActivity.cookie = null;
-
         // Set alarm for checking completed torrents, if not set
         if (PendingIntent.getBroadcast(getApplication(), 0, new Intent(getApplication(), NotifierService.class), PendingIntent.FLAG_NO_CREATE) == null) {
 
@@ -2819,7 +2817,7 @@ protected void getSettings() {
 
         qb_version = sharedPrefs.getString("qb_version", "3.2.x");
 
-//        MainActivity.cookie = sharedPrefs.getString("qbCookie", null);
+        MainActivity.cookie = sharedPrefs.getString("qbCookie", null);
 
         // Get last state
         lastState = sharedPrefs.getString("lastState", "all");
@@ -3632,11 +3630,6 @@ protected Torrent[] doInBackground(String... params) {
 
                         JSONObject json = jArray.getJSONObject(i);
 
-                        Log.d("Debug", "name: " + json.getString(TAG_NAME));
-                        Log.d("Debug", "size: " + json.getString(TAG_SIZE));
-                        Log.d("Debug", "progress: " + json.getString(TAG_PROGRESS));
-                        Log.d("Debug", "qb_version: " + qb_version);
-
                         name = json.getString(TAG_NAME);
                         size = json.getString(TAG_SIZE).replace(",", ".");
                         progress = String.format("%.2f", json.getDouble(TAG_PROGRESS) * 100) + "%";