From daf89f4111f1cd63b80c6467684be3e448b98e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Tue, 30 Sep 2014 08:45:21 +0200 Subject: [PATCH 1/3] Added patch to remove GMS stuff --- metadata/com.lgallardo.qbittorrentclient.txt | 7 +- .../remove_admob.diff | 212 ++++++++++++++++++ 2 files changed, 213 insertions(+), 6 deletions(-) create mode 100644 metadata/com.lgallardo.qbittorrentclient/remove_admob.diff diff --git a/metadata/com.lgallardo.qbittorrentclient.txt b/metadata/com.lgallardo.qbittorrentclient.txt index 2a4d174cdb..f5557ae826 100644 --- a/metadata/com.lgallardo.qbittorrentclient.txt +++ b/metadata/com.lgallardo.qbittorrentclient.txt @@ -1,4 +1,3 @@ -Disabled:play-services Categories:Internet License:GPLv3+ Web Site:https://github.com/lgallard/qBittorrent-Client/blob/HEAD/README.md @@ -24,8 +23,8 @@ Repo Type:git Repo:https://github.com/lgallard/qBittorrent-Client/ Build:2.0,200 - disable=gcm commit=dbcb9d2ca3deba6fbd3d7cc5045fb91e10e8322a + patch=remove_admob.diff subdir=qBittorrentClient srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2 rm=qBittorrentClient/libs/* @@ -42,10 +41,6 @@ Build:2.0,200 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/ -Maintainer Notes: -Waiting for https://github.com/lgallard/qBittorrent-Client/issues/1 -. - Auto Update Mode:None Update Check Mode:RepoManifest diff --git a/metadata/com.lgallardo.qbittorrentclient/remove_admob.diff b/metadata/com.lgallardo.qbittorrentclient/remove_admob.diff new file mode 100644 index 0000000000..7959fc7fe6 --- /dev/null +++ b/metadata/com.lgallardo.qbittorrentclient/remove_admob.diff @@ -0,0 +1,212 @@ +diff --git a/qBittorrentClient/AndroidManifest.xml b/qBittorrentClient/AndroidManifest.xml +index 66b74b3..09b6f95 100644 +--- a/qBittorrentClient/AndroidManifest.xml ++++ b/qBittorrentClient/AndroidManifest.xml +@@ -145,16 +145,6 @@ + android:name="com.lgallardo.qbittorrentclient.OptionsActivity" + android:label="Options" > + +- +- +- +- +- /> + + +- +\ No newline at end of file ++ +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 ++++ b/qBittorrentClient/res/layout-large/activity_main.xml +@@ -21,20 +21,10 @@ + android:layout_height="wrap_content" + android:orientation="vertical" > + +- +- + + +@@ -62,4 +52,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 29b0445..b5b87f8 100644 +--- a/qBittorrentClient/res/layout/activity_main.xml ++++ b/qBittorrentClient/res/layout/activity_main.xml +@@ -21,20 +21,10 @@ + android:layout_height="wrap_content" + android:orientation="vertical" > + +- +- + + + + +- +\ 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 93bd612..39c72fd 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; + import android.widget.TextView; + import android.widget.Toast; + +-import com.google.android.gms.ads.AdRequest; +-import com.google.android.gms.ads.AdView; +- + public class MainActivity extends FragmentActivity { + + // Params to get JSON Array +@@ -159,8 +156,6 @@ public class MainActivity extends FragmentActivity { + + private boolean okay = false; + +- private AdView adView; +- + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); +@@ -318,18 +313,6 @@ public class MainActivity extends FragmentActivity { + + } + +- // 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); +- } +- + // Drawer's method + + @Override +@@ -403,9 +386,6 @@ public class MainActivity extends FragmentActivity { + + qtt.execute(params); + +- // Load banner +- loadBanner(); +- + // Connecting message + Toast.makeText(getApplicationContext(), R.string.connecting, Toast.LENGTH_SHORT).show(); + +diff --git a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java +index af9d1bd..656461d 100644 +--- a/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java ++++ b/qBittorrentClient/src/com/lgallardo/qbittorrentclient/TorrentDetailsFragment.java +@@ -10,10 +10,6 @@ + ******************************************************************************/ + package com.lgallardo.qbittorrentclient; + +-import com.google.android.gms.ads.AdRequest; +-import com.google.android.gms.ads.AdSize; +-import com.google.android.gms.ads.AdView; +- + import android.app.Fragment; + import android.content.pm.ActivityInfo; + import android.os.Bundle; +@@ -45,7 +41,6 @@ public class TorrentDetailsFragment extends Fragment { + + int position; + +- private AdView adView; + private View rootView; + + public TorrentDetailsFragment() { +@@ -143,8 +138,6 @@ public class TorrentDetailsFragment extends Fragment { + Log.e("TorrentDetailsFragment - onCreateView", e.toString()); + } + +- // Load banner +- loadBanner(); + return rootView; + } + +@@ -177,31 +170,4 @@ public class TorrentDetailsFragment extends Fragment { + } + } + +- // Load Banner +- public void loadBanner() { +- +- // LinearLayout linearLayout = null; +- +- // linearLayout.removeView(adView); +- // +- // LinearLayout.LayoutParams adsParams = new +- // LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, +- // LinearLayout.LayoutParams.WRAP_CONTENT, +- // android.view.Gravity.BOTTOM | +- // android.view.Gravity.CENTER_HORIZONTAL); +- // +- // +- // linearLayout.addView(adView, adsParams); +- // +- +- // 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); +- +- } +- + } +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 From b5f898f58980904095c88a1b6370b79735a92e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Tue, 30 Sep 2014 08:53:08 +0200 Subject: [PATCH 2/3] Update CV of qBittorrent Client to 2.2.0 (220) --- metadata/com.lgallardo.qbittorrentclient.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/metadata/com.lgallardo.qbittorrentclient.txt b/metadata/com.lgallardo.qbittorrentclient.txt index f5557ae826..03aea464ee 100644 --- a/metadata/com.lgallardo.qbittorrentclient.txt +++ b/metadata/com.lgallardo.qbittorrentclient.txt @@ -24,8 +24,8 @@ Repo:https://github.com/lgallard/qBittorrent-Client/ Build:2.0,200 commit=dbcb9d2ca3deba6fbd3d7cc5045fb91e10e8322a - patch=remove_admob.diff subdir=qBittorrentClient + patch=remove_admob.diff srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2 rm=qBittorrentClient/libs/* extlibs=android/android-support-v4.jar @@ -40,10 +40,8 @@ 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/ - - Auto Update Mode:None Update Check Mode:RepoManifest -Current Version:2.0 -Current Version Code:200 +Current Version:2.2.0 +Current Version Code:220 From f1f6aa72ad73424fe1c19f6e1eaee44a0db3eeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Tue, 30 Sep 2014 09:15:45 +0200 Subject: [PATCH 3/3] Update qBittorrentClient to v2.2.0 --- metadata/com.lgallardo.qbittorrentclient.txt | 20 ++++- .../remove_admob.diff | 83 ++++++++++--------- .../string_fix.diff | 20 +++++ 3 files changed, 82 insertions(+), 41 deletions(-) create mode 100644 metadata/com.lgallardo.qbittorrentclient/string_fix.diff diff --git a/metadata/com.lgallardo.qbittorrentclient.txt b/metadata/com.lgallardo.qbittorrentclient.txt index 03aea464ee..b73cb9e05e 100644 --- a/metadata/com.lgallardo.qbittorrentclient.txt +++ b/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 diff --git a/metadata/com.lgallardo.qbittorrentclient/remove_admob.diff b/metadata/com.lgallardo.qbittorrentclient/remove_admob.diff index 7959fc7fe6..6b3bd4cf5a 100644 --- a/metadata/com.lgallardo.qbittorrentclient/remove_admob.diff +++ b/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 - \ No newline at end of file + +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 + 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 { - - private boolean okay = false; +@@ -168,8 +165,6 @@ public class MainActivity extends FragmentActivity { + private Handler handler; + private boolean canrefresh = true; - private AdView adView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); -@@ -318,18 +313,6 @@ public class MainActivity extends FragmentActivity { + // For checking if the app is visible + private boolean activityIsVisible = true; +@@ -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 - - @Override -@@ -403,9 +386,6 @@ public class MainActivity extends FragmentActivity { + // Auto-refresh runnable + private final Runnable m_Runnable = new Runnable() { + public void run() +@@ -489,9 +472,6 @@ public class MainActivity extends FragmentActivity { qtt.execute(params); - // Load banner - loadBanner(); - - // Connecting message - Toast.makeText(getApplicationContext(), R.string.connecting, Toast.LENGTH_SHORT).show(); - + // If activity is visible, Connecting message + 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 @@ - ******************************************************************************/ - package com.lgallardo.qbittorrentclient; +@@ -12,10 +12,6 @@ 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; -@@ -45,7 +41,6 @@ public class TorrentDetailsFragment extends Fragment { + import android.os.AsyncTask; +@@ -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; - } + + + // Execute the task in background +@@ -244,33 +236,6 @@ public class TorrentDetailsFragment extends Fragment { -@@ -177,31 +170,4 @@ 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. - target=android-19 --android.library.reference.1=../../../Projects/Android/extras/google/google_play_services/libproject/google-play-services_lib + + // Here is where the action happens + private class qBittorrentGeneralInfoTask extends AsyncTask { diff --git a/metadata/com.lgallardo.qbittorrentclient/string_fix.diff b/metadata/com.lgallardo.qbittorrentclient/string_fix.diff new file mode 100644 index 0000000000..f69a11a906 --- /dev/null +++ b/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 @@ + Hostname or IP + Hostname or IP? + Subfolder +- Subfolder? If you're in doubt, leave it blank! ++ Subfolder? If you\'re in doubt, leave it blank! + Enable https + Connect using https + Connection Port +@@ -145,4 +145,4 @@ + Maximum active torrents + Maximum active torrents? + +- +\ No newline at end of file ++