Karl/BobStore
1
0
포크 0
코드 이슈 풀 리퀘스트 Actions Packages Projects 릴리즈 위키 활동

cleaned up code, prevented multiple app details screens popping up, fixed "no such app" toast after install

소스 검색
This commit is contained in:
Toby Kurien 2015-09-04 14:44:14 +02:00 committed by Peter Serwylo
부모 e827be1b5b
커밋 efd4ebeadf
3개의 변경된 파일과 21개의 추가작업 그리고 19개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
F-Droid/src/org/fdroid/fdroid/AppDetails.java
파일 보기

@ -365,21 +365,6 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
private String getAppIdFromIntent() {
Intent i = getIntent();
if (!i.hasExtra(EXTRA_APPID)) {
if (i.hasExtra(DownloadManager.EXTRA_DOWNLOAD_ID)) {
// we have been passed a DownloadManager download id, so get the app id for it
long downloadId = i.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
return AsyncDownloader.getAppId(this, downloadId);
}
if (i.hasExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS)) {
// we have been passed a DownloadManager download id, so get the app id for it
long[] downloadIds = i.getLongArrayExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS);
if (downloadIds != null && downloadIds.length > 0) {
return AsyncDownloader.getAppId(this, downloadIds[0]);
}
}
Log.e(TAG, "No application ID found in the intent!");
return null;
}

17
F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java
파일 보기

@ -150,10 +150,21 @@ public class AsyncDownloader extends AsyncDownloadWrapper {
*/
public static long getDownloadId(Intent intent) {
if (intent != null) {
return intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
} else {
return -1;
if (intent.hasExtra(DownloadManager.EXTRA_DOWNLOAD_ID)) {
// we have been passed a DownloadManager download id, so get the app id for it
return intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
}
if (intent.hasExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS)) {
// we have been passed a DownloadManager download id, so get the app id for it
long[] downloadIds = intent.getLongArrayExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS);
if (downloadIds != null && downloadIds.length > 0) {
return downloadIds[0];
}
}
}
return -1;
}
/**

8
F-Droid/src/org/fdroid/fdroid/receiver/DownloadManagerReceiver.java
파일 보기

@ -5,6 +5,7 @@ import android.content.Context;
import android.content.Intent;
import org.fdroid.fdroid.AppDetails;
import org.fdroid.fdroid.net.AsyncDownloader;
/**
* Receive notifications from the Android DownloadManager
@ -12,11 +13,16 @@ import org.fdroid.fdroid.AppDetails;
public class DownloadManagerReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
// work out the app Id to send to the AppDetails Screen
long downloadId = AsyncDownloader.getDownloadId(intent);
String appId = AsyncDownloader.getAppId(context, downloadId);
// pass the download manager broadcast onto the AppDetails screen and let it handle it
Intent appDetails = new Intent(context, AppDetails.class);
appDetails.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
appDetails.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
appDetails.setAction(intent.getAction());
appDetails.putExtras(intent.getExtras());
appDetails.putExtra(AppDetails.EXTRA_APPID, appId);
context.startActivity(appDetails);
}
}