diff --git a/app/src/main/java/com/fastaccess/provider/tasks/NotificationJobTask.java b/app/src/main/java/com/fastaccess/provider/tasks/NotificationJobTask.java index 3897e27c..db75a6d7 100644 --- a/app/src/main/java/com/fastaccess/provider/tasks/NotificationJobTask.java +++ b/app/src/main/java/com/fastaccess/provider/tasks/NotificationJobTask.java @@ -16,6 +16,7 @@ import com.fastaccess.data.dao.NotificationThreadModel; import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.Logger; import com.fastaccess.provider.rest.RestProvider; +import com.fastaccess.ui.modules.main.MainView; import com.firebase.jobdispatcher.Constraint; import com.firebase.jobdispatcher.FirebaseJobDispatcher; import com.firebase.jobdispatcher.GooglePlayDriver; @@ -80,13 +81,15 @@ public class NotificationJobTask extends JobService { .count(); Logger.e(count, notificationThreadModels); if (count > 0) { + Intent intent = new Intent(this, MainView.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); Context context = getApplicationContext(); Notification notification = new NotificationCompat.Builder(context) .setSmallIcon(R.drawable.ic_announcement) .setContentTitle(context.getString(R.string.notifictions)) .setContentText(context.getString(R.string.unread_notification) + " (" + count + ")") .setNumber((int) count) - .addAction(R.drawable.ic_github, context.getString(R.string.open), PendingIntent.getActivity(context, 0, new Intent(), + .addAction(R.drawable.ic_github, context.getString(R.string.open), PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)) .build(); ((NotificationManager) context.getSystemService(NOTIFICATION_SERVICE)).notify(BundleConstant.REQUEST_CODE, notification); diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java index 4038227a..7a6fe4b4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java @@ -1,5 +1,7 @@ package com.fastaccess.ui.modules.main; +import android.app.NotificationManager; +import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; @@ -96,6 +98,7 @@ public class MainView extends BaseActivity implemen onHideShowFab(); hideShowShadow(navType != MainMvp.PROFILE); enableAds.setChecked(PrefGetter.isAdsEnabled()); + ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).cancel(BundleConstant.REQUEST_CODE);//cancel notification if any. } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesPresenter.java index 4b5c248a..46cf33bd 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesPresenter.java @@ -19,7 +19,7 @@ class CommitFilesPresenter extends BasePresenter implements private CommitFileListModel files = new CommitFileListModel(); @Override public void onItemClick(int position, View v, CommitFileModel item) { - + } @Override public void onItemLongClick(int position, View v, CommitFileModel item) { diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesView.java index 27b4cdf5..cc2f217d 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/files/CommitFilesView.java @@ -8,6 +8,7 @@ import android.view.View; import com.fastaccess.R; import com.fastaccess.data.dao.CommitFileListModel; import com.fastaccess.data.dao.SparseBooleanArrayParcelable; +import com.fastaccess.helper.ActivityHelper; import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.Bundler; import com.fastaccess.ui.adapter.CommitFilesAdapter; @@ -66,6 +67,9 @@ public class CommitFilesView extends BaseFragment