Update qBittorrentClient to v2.2.0

metadata/com.lgallardo.qbittorrentclient.txt

@@ -23,7 +23,7 @@ Repo Type:git
 Repo:https://github.com/lgallard/qBittorrent-Client/
 
 Build:2.0,200
-    commit=dbcb9d2ca3deba6fbd3d7cc5045fb91e10e8322a
+    commit=v2.0
     subdir=qBittorrentClient
     patch=remove_admob.diff
     srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2
@@ -40,6 +40,24 @@ Build:2.0,200
         popd && \
         cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
 
+Build:2.2.0,220
+    commit=v2.2.0
+    subdir=qBittorrentClient
+    patch=remove_admob.diff,string_fix.diff
+    srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2
+    rm=qBittorrentClient/libs/*
+    extlibs=android/android-support-v4.jar
+    prebuild=pushd $$ApacheHttpClient$$/httpclient/ && \
+        $$MVN3$$ package && \
+        popd && \
+        pushd $$ApacheHttpClient$$/httpmime/ && \
+        $$MVN3$$ package && \
+        popd && \
+        pushd $$ApacheHttpCore$$/httpcore && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.2.0

metadata/com.lgallardo.qbittorrentclient/remove_admob.diff

@@ -1,5 +1,5 @@
 diff --git a/qBittorrentClient/AndroidManifest.xml b/qBittorrentClient/AndroidManifest.xml
-index 66b74b3..09b6f95 100644
+index 40f46ae..fe7b0ea 100644
 --- a/qBittorrentClient/AndroidManifest.xml
 +++ b/qBittorrentClient/AndroidManifest.xml
 @@ -145,16 +145,6 @@
@@ -21,6 +21,15 @@ index 66b74b3..09b6f95 100644
 -</manifest>
 \ No newline at end of file
 +</manifest>
+diff --git a/qBittorrentClient/project.properties b/qBittorrentClient/project.properties
+index 745e472..7472fc8 100644
+--- a/qBittorrentClient/project.properties
++++ b/qBittorrentClient/project.properties
+@@ -22,4 +22,3 @@
+ 
+ # Project target.
+ target=android-19
+-android.library.reference.1=../../../Projects/Android/extras/google/google_play_services/libproject/google-play-services_lib
 diff --git a/qBittorrentClient/res/layout-large/activity_main.xml b/qBittorrentClient/res/layout-large/activity_main.xml
 index c6e4215..462c7c3 100644
 --- a/qBittorrentClient/res/layout-large/activity_main.xml
@@ -86,7 +95,7 @@ index 29b0445..b5b87f8 100644
 \ No newline at end of file
 +</android.support.v4.widget.DrawerLayout>
 diff --git a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java
-index 93bd612..39c72fd 100644
+index 147d00d..a55edf2 100644
 --- a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java
 +++ b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java
 @@ -48,9 +48,6 @@ import android.widget.ListView;
@@ -99,17 +108,17 @@ index 93bd612..39c72fd 100644
  public class MainActivity extends FragmentActivity {
  
  	// Params to get JSON Array
-@@ -159,8 +156,6 @@ public class MainActivity extends FragmentActivity {
+@@ -168,8 +165,6 @@ public class MainActivity extends FragmentActivity {
- 
+ 	private Handler handler;
- 	private boolean okay = false;
+ 	private boolean canrefresh = true;
  
 -	private AdView adView;
 -
- 	@Override
+ 	// For checking if the app is visible
- 	protected void onCreate(Bundle savedInstanceState) {
+ 	private boolean activityIsVisible = true;
- 		super.onCreate(savedInstanceState);
-@@ -318,18 +313,6 @@ public class MainActivity extends FragmentActivity {
  
+@@ -347,18 +342,6 @@ public class MainActivity extends FragmentActivity {
+ 		activityIsVisible = false;
  	}
  
 -	// Load Banner
@@ -124,26 +133,26 @@ index 93bd612..39c72fd 100644
 -		adView.loadAd(adRequest);
 -	}
 -
- 	// Drawer's method
+ 	// Auto-refresh runnable
- 
+ 	private final Runnable m_Runnable = new Runnable() {
- 	@Override
+ 		public void run()
-@@ -403,9 +386,6 @@ public class MainActivity extends FragmentActivity {
+@@ -489,9 +472,6 @@ public class MainActivity extends FragmentActivity {
  
  			qtt.execute(params);
  
 -			// Load banner
 -			loadBanner();
 -
- 			// Connecting message
+ 			// If activity is visible, Connecting message
- 			Toast.makeText(getApplicationContext(), R.string.connecting, Toast.LENGTH_SHORT).show();
+ 			if (activityIsVisible) {
- 
+ 				// Connecting message
 diff --git a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java
-index af9d1bd..656461d 100644
+index 28aa42f..a12a937 100644
 --- a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java
 +++ b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java
-@@ -10,10 +10,6 @@
+@@ -12,10 +12,6 @@ package com.lgallardo.qbittorrentclient;
-  ******************************************************************************/
+ 
- package com.lgallardo.qbittorrentclient;
+ import org.json.JSONObject;
  
 -import com.google.android.gms.ads.AdRequest;
 -import com.google.android.gms.ads.AdSize;
@@ -151,28 +160,30 @@ index af9d1bd..656461d 100644
 -
  import android.app.Fragment;
  import android.content.pm.ActivityInfo;
- import android.os.Bundle;
+ import android.os.AsyncTask;
-@@ -45,7 +41,6 @@ public class TorrentDetailsFragment extends Fragment {
+@@ -50,7 +46,6 @@ public class TorrentDetailsFragment extends Fragment {
  
- 	int position;
+ 	JSONObject json2;
  
 -	private AdView adView;
  	private View rootView;
  
  	public TorrentDetailsFragment() {
-@@ -143,8 +138,6 @@ public class TorrentDetailsFragment extends Fragment {
+@@ -204,9 +199,6 @@ public class TorrentDetailsFragment extends Fragment {
+ 			// TODO Auto-generated catch block
  			Log.e("TorrentDetailsFragment - onCreateView", e.toString());
  		}
- 
+-
 -		// Load banner
 -		loadBanner();
- 		return rootView;
- 	}
  		
-@@ -177,31 +170,4 @@ public class TorrentDetailsFragment extends Fragment {
+ 		
+ 		// Execute the task in background
+@@ -244,33 +236,6 @@ public class TorrentDetailsFragment extends Fragment {
+ 
  		}
  	}
- 
+-
 -	// Load Banner
 -	public void loadBanner() {
 -
@@ -199,14 +210,6 @@ index af9d1bd..656461d 100644
 -		adView.loadAd(adRequest);
 -
 -	}
--
- }
-diff --git a/qBittorrentClient/project.properties b/qBittorrentClient/project.properties
-index 745e472..7472fc8 100644
---- a/qBittorrentClient/project.properties
-+++ b/qBittorrentClient/project.properties
-@@ -22,4 +22,3 @@
  	
- # Project target.
+ 	// Here is where the action happens
- target=android-19
+ 	private class qBittorrentGeneralInfoTask extends AsyncTask<View, View, View[]> {
--android.library.reference.1=../../../Projects/Android/extras/google/google_play_services/libproject/google-play-services_lib

metadata/com.lgallardo.qbittorrentclient/string_fix.diff

@@ -0,0 +1,20 @@
+diff --git a/qBittorrentClient/res/values/strings.xml b/qBittorrentClient/res/values/strings.xml
+index f2fd97d..2b929a9 100644
+--- a/qBittorrentClient/res/values/strings.xml
++++ b/qBittorrentClient/res/values/strings.xml
+@@ -101,7 +101,7 @@
+     <string name="settings_qbittorrent_hostname_summary">Hostname or IP</string>
+     <string name="settings_qbittorrent_hostname_dialog_title">Hostname or IP?</string>
+     <string name="settings_qbittorrent_subfolder_title">Subfolder</string>
+-    <string name="settings_qbittorrent_subfolder_dialog_title">Subfolder? If you're in doubt, leave it blank!</string>
++    <string name="settings_qbittorrent_subfolder_dialog_title">Subfolder? If you\'re in doubt, leave it blank!</string>
+     <string name="settings_qbittorrent_https_title">Enable https</string>
+     <string name="settings_qbittorrent_https_summary">Connect using https</string>
+     <string name="settings_qbittorrent_port_title">Connection Port</string>
+@@ -145,4 +145,4 @@
+     <string name="options_qbittorrent_torrent_queueing_max_active_torrents_title">Maximum active torrents</string>
+     <string name="options_qbittorrent_torrent_queueing_max_active_torrents_dialog_title">Maximum active torrents?</string>
+ 
+-</resources>
+\ No newline at end of file
++</resources>