Skip to content

Commit 4e6251c

Browse files
author
Vincent Gachet
committed
Test remove downloader lib to fix pom file
1 parent 5975564 commit 4e6251c

File tree

5 files changed

+26
-27
lines changed

5 files changed

+26
-27
lines changed

app/src/main/java/fr/smartapps/smaassetmanager/obb/ObbBroadcastReceiver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
import android.content.Intent;
55
import android.content.pm.PackageManager;
66

7-
import com.google.android.vending.expansion.downloader.DownloaderClientMarshaller;
8-
import com.google.android.vending.expansion.downloader.impl.DownloaderService;
7+
//import com.google.android.vending.expansion.downloader.DownloaderClientMarshaller;
8+
//import com.google.android.vending.expansion.downloader.impl.DownloaderService;
99

1010
/**
1111
* The BroadcastReceiver will start the download service if the files need to be downloaded.
1212
*/
1313
public class ObbBroadcastReceiver extends android.content.BroadcastReceiver {
1414
@Override
1515
public void onReceive(Context context, Intent intent) {
16-
try {
16+
/*try {
1717
DownloaderClientMarshaller.startDownloadServiceIfRequired(context, intent, DownloaderService.class);
1818
} catch (PackageManager.NameNotFoundException e) {
1919
e.printStackTrace();
20-
}
20+
}*/
2121
}
2222
}

app/src/main/java/fr/smartapps/smaassetmanager/obb/ObbDownloadActivity.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import android.support.v7.app.AlertDialog;
1313
import android.util.Log;
1414

15-
import com.google.android.vending.expansion.downloader.DownloadProgressInfo;
16-
import com.google.android.vending.expansion.downloader.DownloaderClientMarshaller;
17-
import com.google.android.vending.expansion.downloader.DownloaderServiceMarshaller;
18-
import com.google.android.vending.expansion.downloader.IDownloaderClient;
19-
import com.google.android.vending.expansion.downloader.IDownloaderService;
20-
import com.google.android.vending.expansion.downloader.IStub;
21-
import com.google.android.vending.expansion.downloader.impl.DownloaderService;
15+
//import com.google.android.vending.expansion.downloader.DownloadProgressInfo;
16+
//import com.google.android.vending.expansion.downloader.DownloaderClientMarshaller;
17+
//import com.google.android.vending.expansion.downloader.DownloaderServiceMarshaller;
18+
//import com.google.android.vending.expansion.downloader.IDownloaderClient;
19+
//import com.google.android.vending.expansion.downloader.IDownloaderService;
20+
//import com.google.android.vending.expansion.downloader.IStub;
21+
//import com.google.android.vending.expansion.downloader.impl.DownloaderService;
2222

2323
import java.util.Set;
2424

@@ -31,9 +31,9 @@
3131
* => log "Try download expansion file"
3232
* => process start to download OBB
3333
*/
34-
public abstract class ObbDownloadActivity extends Activity implements IDownloaderClient {
34+
public abstract class ObbDownloadActivity extends Activity /*implements IDownloaderClient*/ {
3535

36-
private String TAG = "ObbDownloadActivity";
36+
/*private String TAG = "ObbDownloadActivity";
3737
3838
// obb
3939
static int obb_size = 0;
@@ -51,7 +51,7 @@ public abstract class ObbDownloadActivity extends Activity implements IDownloade
5151
protected void onCreate(Bundle savedInstanceState) {
5252
super.onCreate(savedInstanceState);
5353
54-
/* // OBB config
54+
*//* // OBB config
5555
obb_size = getResources().getInteger(R.integer.config_expansion_file_main_size);
5656
obb_version = getResources().getInteger(R.integer.config_expansion_file_main_version);
5757
@@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
6262
}
6363
else {
6464
Log.d(TAG, "Expansion files delivered");
65-
}*/
65+
}*//*
6666
}
6767
6868
@Override
@@ -72,9 +72,9 @@ protected void onResume() {
7272
mExpansionFilesDownloaderClientStub.connect(this);
7373
}
7474
75-
/* if (null != mDownloadExpansionFilesDialog && mDownloadExpansionFilesDialog.isShowing() && expansionFilesDelivered()) {
75+
*//* if (null != mDownloadExpansionFilesDialog && mDownloadExpansionFilesDialog.isShowing() && expansionFilesDelivered()) {
7676
dismissDialog(DIALOG_DOWNLOAD_EXPANSION_FILES);
77-
}*/
77+
}*//*
7878
7979
}
8080
@@ -164,7 +164,7 @@ protected void onPrepareDialog(int id, final Dialog dialog, Bundle args) {
164164
}
165165
}
166166
167-
/* boolean expansionFilesDelivered() {
167+
*//* boolean expansionFilesDelivered() {
168168
String mainFilename = getResources().getBoolean(R.bool.config_expansion_file_needs_main) ? Helpers.getExpansionAPKFileName(this, true, getResources().getInteger(R.integer.config_expansion_file_main_version)) : null;
169169
String patchFilename = getResources().getBoolean(R.bool.config_expansion_file_needs_patch) ? Helpers.getExpansionAPKFileName(this, false, getResources().getInteger(R.integer.config_expansion_file_patch_version)) : null;
170170
@@ -176,7 +176,7 @@ protected void onPrepareDialog(int id, final Dialog dialog, Bundle args) {
176176
return false;
177177
}
178178
return true;
179-
}*/
179+
}*//*
180180
181181
private void tryDownloadExpansionFiles() {
182182
@@ -228,6 +228,6 @@ protected void forwardCategories(Intent intent) {
228228
intent.addCategory(category);
229229
}
230230
}
231-
}
231+
}*/
232232

233233
}

app/src/main/java/fr/smartapps/smaassetmanager/obb/ObbDownloadService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package fr.smartapps.smaassetmanager.obb;
22

3-
import com.google.android.vending.expansion.downloader.impl.DownloaderService;
3+
//import com.google.android.vending.expansion.downloader.impl.DownloaderService;
44

55
/**
66
* The DownloaderService handles the downloading of expansion files from the Play Store and informs about the the progress to subscribing activities.
77
* We will take a look at how to configure the activity to begin downloads in a moment.
88
*
99
* You must update the BASE64_PUBLIC_KEY value to be the public key belonging to your publisher account.
1010
*/
11-
public class ObbDownloadService extends DownloaderService {
11+
public class ObbDownloadService /*extends DownloaderService*/ {
1212

13-
String PUBLIC_KEY = "";
13+
/* String PUBLIC_KEY = "";
1414
1515
// You must use the public key belonging to your publisher account
1616
// You should also modify this salt
@@ -31,5 +31,5 @@ public byte[] getSALT() {
3131
@Override
3232
public String getAlarmReceiverClassName() {
3333
return ObbBroadcastReceiver.class.getName();
34-
}
34+
}*/
3535
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919

20-
projectversion = 1.0.35
20+
projectversion = 1.0.36
2121

2222
publishedgroupid = com.github.VGachet
2323
libraryname = sma_assetmanager

lib_smaassetmanager/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ dependencies {
2828
api 'commons-io:commons-io:2.4'
2929
api 'com.github.bumptech.glide:glide:3.7.0'
3030
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
31-
api(name: 'downloader_library', ext: 'aar')
3231
}
3332

3433
repositories {
@@ -43,7 +42,7 @@ afterEvaluate {
4342

4443
groupId = 'com.github.VGachet'
4544
artifactId = 'sma_assetmanager'
46-
version = '1.0.35'
45+
version = '1.0.36'
4746

4847
pom {
4948
packaging 'aar'

0 commit comments

Comments
 (0)