From c4bbd2ca87f45549c20ccd2887230ff5d1e420d7 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 17 Feb 2018 15:42:09 +0100
Subject: [PATCH] Handles intent

---
 app/src/main/AndroidManifest.xml                              | 1 +
 .../fr/gouv/etalab/mastodon/activities/BaseMainActivity.java  | 4 ++++
 app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java  | 1 +
 .../mastodon/services/BackupStatusInDataBaseService.java      | 4 ++--
 app/src/main/res/values/strings.xml                           | 2 ++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90a80a352..3a8265be9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -162,6 +162,7 @@
             android:windowSoftInputMode="stateAlwaysHidden"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
+            android:launchMode="singleTask"
             />
         <activity android:name=".activities.AboutActivity"
             android:windowSoftInputMode="stateAlwaysHidden"
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index 23c05b246..6aed798f6 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -108,6 +108,7 @@ import fr.gouv.etalab.mastodon.fragments.TabLayoutSettingsFragment;
 import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
 
 import static fr.gouv.etalab.mastodon.helper.Helper.ADD_USER_INTENT;
+import static fr.gouv.etalab.mastodon.helper.Helper.BACKUP_INTENT;
 import static fr.gouv.etalab.mastodon.helper.Helper.CHANGE_THEME_INTENT;
 import static fr.gouv.etalab.mastodon.helper.Helper.CHANGE_USER_INTENT;
 import static fr.gouv.etalab.mastodon.helper.Helper.EXTERNAL_STORAGE_REQUEST_CODE;
@@ -1080,6 +1081,9 @@ public abstract class BaseMainActivity extends BaseActivity
                 }
             }else if (extras.getInt(INTENT_ACTION) == ADD_USER_INTENT){
                 this.recreate();
+            }else if( extras.getInt(INTENT_ACTION) == BACKUP_INTENT){
+                Intent myIntent = new Intent(BaseMainActivity.this, OwnerStatusActivity.class);
+                startActivity(myIntent);
             }
         }else if( Intent.ACTION_SEND.equals(action) && type != null ) {
             if ("text/plain".equals(type)) {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 39b0623f2..1440d60fb 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -208,6 +208,7 @@ public class Helper {
     public static final int CHANGE_THEME_INTENT = 3;
     public static final int CHANGE_USER_INTENT = 4;
     public static final int ADD_USER_INTENT = 5;
+    public static final int BACKUP_INTENT = 6;
     //Settings
     public static final String SET_TOOTS_PER_PAGE = "set_toots_per_page";
     public static final String SET_ACCOUNTS_PER_PAGE = "set_accounts_per_page";
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/BackupStatusInDataBaseService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/BackupStatusInDataBaseService.java
index b2ccb11fe..634b495b5 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/services/BackupStatusInDataBaseService.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/BackupStatusInDataBaseService.java
@@ -116,14 +116,14 @@ public class BackupStatusInDataBaseService extends IntentService {
             }while (max_id != null && canContinue);
 
 
-            message = getString(R.string.data_export_success, String.valueOf(statusToBackUp), String.valueOf(backupStatus.size()));
+            message = getString(R.string.data_backup_success, String.valueOf(backupStatus.size()));
             intentOpen = new Intent();
 
 
 
             long notif_id = Long.parseLong(account.getId());
             int notificationId = ((notif_id + 4) > 2147483647) ? (int) (2147483647 - notif_id - 4) : (int) (notif_id + 4);
-            String title = getString(R.string.data_export_toots, account.getAcct());
+            String title = getString(R.string.data_backup_toots, account.getAcct());
             notify_user(getApplicationContext(), intentOpen, notificationId, BitmapFactory.decodeResource(getResources(),
                     R.drawable.mastodonlogo), title, message);
         } catch (Exception e) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b8a7120c..8642483bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -409,6 +409,8 @@
     <string name="show_media">Show media</string>
     <string name="show_pinned">Show pinned</string>
     <string name="filter_no_result">No matching result found!</string>
+    <string name="data_backup_toots">Backup toots for %1$s</string>
+    <string name="data_backup_success">%1$s new toots have been imported</string>
     <string-array name="filter_select">
         <item>No</item>
         <item>Only</item>