diff --git a/metadata/com.lgallardo.qbittorrentclient.txt b/metadata/com.lgallardo.qbittorrentclient.txt index 7154859bc6..7aa97a8ef3 100644 --- a/metadata/com.lgallardo.qbittorrentclient.txt +++ b/metadata/com.lgallardo.qbittorrentclient.txt @@ -77,6 +77,24 @@ Build:2.7.1,271 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:3.7.0,370 + commit=5779e53c6b8b3b5634bf1a38525947b85837be52 + subdir=qBittorrentClient + srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2 + rm=qBittorrentClient/libs/* + extlibs=android/android-support-v4.jar + patch=remove_ads_370.patch + build=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:3.7.0 diff --git a/metadata/com.lgallardo.qbittorrentclient/remove_ads_370.patch b/metadata/com.lgallardo.qbittorrentclient/remove_ads_370.patch new file mode 100644 index 0000000000..2b4b94be58 --- /dev/null +++ b/metadata/com.lgallardo.qbittorrentclient/remove_ads_370.patch @@ -0,0 +1,204 @@ +diff --git a/qBittorrentClient/AndroidManifest.xml b/qBittorrentClient/AndroidManifest.xml +index f0cdd08..5146db9 100644 +--- a/qBittorrentClient/AndroidManifest.xml ++++ b/qBittorrentClient/AndroidManifest.xml +@@ -148,10 +148,6 @@ + android:name="com.lgallardo.qbittorrentclient.OptionsActivity" + android:label="Options" + android:theme="@style/Theme_Light"> +- + + + +@@ -164,10 +160,6 @@ + + + +- +- /> + + +- +\ No newline at end of file ++ +diff --git a/qBittorrentClient/project.properties b/qBittorrentClient/project.properties +index 4ba674e..6b9481d 100644 +--- a/qBittorrentClient/project.properties ++++ b/qBittorrentClient/project.properties +@@ -32,4 +32,3 @@ + + # Project target. + target=android-19 +-android.library.reference.1=../../../workspace/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 08566a6..4e752fc 100644 +--- a/qBittorrentClient/res/layout-large/activity_main.xml ++++ b/qBittorrentClient/res/layout-large/activity_main.xml +@@ -20,15 +20,6 @@ + android:layout_height="wrap_content" + android:orientation="horizontal"> + +- +- + +@@ -77,4 +67,4 @@ + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> + +- +\ No newline at end of file ++ +diff --git a/qBittorrentClient/res/layout/activity_main.xml b/qBittorrentClient/res/layout/activity_main.xml +index f045d41..e582b19 100644 +--- a/qBittorrentClient/res/layout/activity_main.xml ++++ b/qBittorrentClient/res/layout/activity_main.xml +@@ -34,15 +34,6 @@ + android:layout_height="match_parent" + android:layout_below="@+id/progressBarConnecting" + android:paddingBottom="50dp" /> +- +- + + + + +- +\ No newline at end of file ++ +diff --git a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java +index 2de492d..1a2d19b 100644 +--- a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java ++++ b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/MainActivity.java +@@ -49,9 +49,6 @@ import android.widget.SearchView; + import android.widget.TextView; + import android.widget.Toast; + +-import com.google.android.gms.ads.AdRequest; +-import com.google.android.gms.ads.AdView; +- + import org.json.JSONArray; + import org.json.JSONObject; + +@@ -167,8 +164,6 @@ public class MainActivity extends FragmentActivity { + private Handler handler; + private boolean canrefresh = true; + +- private AdView adView; +- + // For checking if the app is visible + private boolean activityIsVisible = true; + +@@ -510,18 +505,6 @@ public class MainActivity extends FragmentActivity { + activityIsVisible = false; + } + +- // Load Banner +- +- public void loadBanner() { +- +- // Look up the AdView as a resource and load a request. +- adView = (AdView) this.findViewById(R.id.adView); +- AdRequest adRequest = new AdRequest.Builder().build(); +- +- // Start loading the ad in the background. +- adView.loadAd(adRequest); +- } +- + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); +@@ -654,9 +637,6 @@ public class MainActivity extends FragmentActivity { + + if (networkInfo != null && networkInfo.isConnected() && !networkInfo.isFailover()) { + +- // Load banner +- loadBanner(); +- + if (hostname.equals("")) { + // Hide progressBar + if (progressBar != null) { +diff --git a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java +index a2c573b..58c8134 100644 +--- a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java ++++ b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java +@@ -29,9 +29,6 @@ import android.widget.ListView; + import android.widget.ProgressBar; + import android.widget.TextView; + +-import com.google.android.gms.ads.AdRequest; +-import com.google.android.gms.ads.AdView; +- + import org.json.JSONArray; + import org.json.JSONObject; + +@@ -74,7 +71,6 @@ public class TorrentDetailsFragment extends Fragment { + myTrackerAdapter trackerAdapter; + myPropertyAdapter propertyAdapter; + +- private AdView adView; + private View rootView; + + public TorrentDetailsFragment() { +@@ -256,9 +252,6 @@ public class TorrentDetailsFragment extends Fragment { + Log.e("TorrentDetailsFragment - onCreateView", e.toString()); + } + +- // Load banner +- loadBanner(); +- + return rootView; + } + +@@ -328,20 +321,6 @@ public class TorrentDetailsFragment extends Fragment { + } + } + +- // Load Banner +- public void loadBanner() { +- +- // Get the adView. +- adView = (AdView) getActivity().findViewById(R.id.adView); +- +- AdRequest adRequest = new AdRequest.Builder().build(); +- +- // Start loading the ad in the background. +- adView.loadAd(adRequest); +- +- } +- +- + // // Here is where the action happens + private class qBittorrentContentFile extends AsyncTask { +