Skip to content

Commit

Permalink
Merge pull request #21 from sadegh/sk/dev
Browse files Browse the repository at this point in the history
Simplify finding of the main activity.
  • Loading branch information
JakeWharton committed Mar 12, 2017
2 parents dc0b6b9 + 6aa3479 commit 1eb522d
Showing 1 changed file with 4 additions and 18 deletions.
Expand Up @@ -17,21 +17,14 @@

import android.app.Activity;
import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.os.Process;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import static android.content.Intent.ACTION_MAIN;
import static android.content.Intent.CATEGORY_DEFAULT;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

Expand Down Expand Up @@ -72,18 +65,11 @@ public static void triggerRebirth(Context context, Intent... nextIntents) {
}

private static Intent getRestartIntent(Context context) {
Intent defaultIntent = new Intent(ACTION_MAIN, null);
defaultIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
defaultIntent.addCategory(CATEGORY_DEFAULT);

String packageName = context.getPackageName();
PackageManager packageManager = context.getPackageManager();
for (ResolveInfo resolveInfo : packageManager.queryIntentActivities(defaultIntent, 0)) {
ActivityInfo activityInfo = resolveInfo.activityInfo;
if (activityInfo.packageName.equals(packageName)) {
defaultIntent.setComponent(new ComponentName(packageName, activityInfo.name));
return defaultIntent;
}
Intent defaultIntent = context.getPackageManager().getLaunchIntentForPackage(packageName);
if (defaultIntent != null) {
defaultIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
return defaultIntent;
}

throw new IllegalStateException("Unable to determine default activity for "
Expand Down

0 comments on commit 1eb522d

Please sign in to comment.