diff --git a/app/build.gradle b/app/build.gradle index b0f336223..2e1092d26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 25 - versionCode 13 - versionName "1.1.6" + versionCode 14 + versionName "1.1.7" } buildTypes { release { diff --git a/app/mastodon-etalab-v1.1.6.apk b/app/mastodon-etalab-v1.1.6.apk new file mode 100644 index 000000000..d6862bca7 Binary files /dev/null and b/app/mastodon-etalab-v1.1.6.apk differ diff --git a/app/mastodon-etalab-v1.1.7.apk b/app/mastodon-etalab-v1.1.7.apk new file mode 100644 index 000000000..e04d8bf83 Binary files /dev/null and b/app/mastodon-etalab-v1.1.7.apk differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index d88d20c2f..5363871e5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -16,7 +16,6 @@ package fr.gouv.etalab.mastodon.client; import android.content.Context; import android.content.SharedPreferences; -import android.util.Log; import android.widget.Toast; import com.loopj.android.http.AsyncHttpResponseHandler; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java index d20fef29a..b40d11066 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java @@ -22,6 +22,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.AsyncTask; import android.support.annotation.NonNull; +import android.util.Log; import com.evernote.android.job.Job; import com.evernote.android.job.JobManager; @@ -97,7 +98,6 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe final SharedPreferences sharedpreferences = getContext().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); boolean notif_hometimeline = sharedpreferences.getBoolean(Helper.SET_NOTIF_HOMETIMELINE, true); - //User disagree with home timeline refresh if( !notif_hometimeline) return; //Nothing is done @@ -171,7 +171,6 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK ); intent.putExtra(INTENT_ACTION, HOME_TIMELINE_INTENT); intent.putExtra(PREF_KEY_ID, userId); - if( max_id != null) notify_user(getContext(), intent, notificationId, icon_notification,title,message); SharedPreferences.Editor editor = sharedpreferences.edit(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java index 171b4a5b2..228a4fbec 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java @@ -22,6 +22,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.AsyncTask; import android.support.annotation.NonNull; +import android.util.Log; import com.evernote.android.job.Job; import com.evernote.android.job.JobManager;