Added patch to remove GMS stuff

This commit is contained in:
أحمد المحمودي (Ahmed El-Mahmoudy) 2014-09-30 08:45:21 +02:00
parent ff8b30996a
commit daf89f4111
2 changed files with 213 additions and 6 deletions

View file

@ -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

View file

@ -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" >
</activity>
- <activity
- android:name="com.google.android.gms.ads.AdActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
- android:theme="@android:style/Theme.Translucent" >
- </activity>
-
- <meta-data
- android:name="com.google.android.gms.version"
- android:value="@integer/google_play_services_version" />
- />
</application>
-</manifest>
\ No newline at end of file
+</manifest>
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" >
- <com.google.android.gms.ads.AdView
- android:id="@+id/adView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- ads:adSize="SMART_BANNER"
- ads:adUnitId="ca-app-pub-1035265933040074/6449288097"
- android:gravity="bottom" />
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="fill_parent"
android:layout_height="match_parent"
- android:layout_above="@+id/adView"
android:orientation="horizontal"
android:baselineAligned="false" >
@@ -62,4 +52,4 @@
android:divider="@android:color/transparent"
android:dividerHeight="0dp" />
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
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" >
- <com.google.android.gms.ads.AdView
- android:id="@+id/adView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- ads:adSize="SMART_BANNER"
- ads:adUnitId="ca-app-pub-1035265933040074/6449288097"
- android:gravity="bottom" />
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_above="@+id/adView"
android:orientation="horizontal" >
<FrameLayout
@@ -55,4 +45,4 @@
android:divider="@android:color/transparent"
android:dividerHeight="0dp" />
-</android.support.v4.widget.DrawerLayout>
\ 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
--- 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