Merge pull request #385 from jmpascal/1.6.1

ANDROID-276
Alfresco · Mar 8, 2016 · 9b986ad · 9b986ad
2 parents 826f011 + cc42380
commit 9b986ad
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/alfresco-mobile-android/src/main/res/values-it/strings.xml b/alfresco-mobile-android/src/main/res/values-it/strings.xml
@@ -344,7 +344,7 @@
     <string name="settings_custom_menu_disable">Funzione disabilitata dall\'amministratore Alfresco.</string>
     <string name="settings.feedback">Commenti</string>
     <string name="settings.feedback.diagnostic">Invia diagnostica</string>
-    <string name="settings.feedback.diagnostic.summary">Al fine di migliorare Alfresco Mobile, raccogliamo dati tecnici anonimi relativi alla diagnostica. Disattivare, se lo si preferisce.</string>
+    <string name="settings.feedback.diagnostic.summary">Al fine di migliorare Alfresco Mobile, vengono raccolti dati tecnici anonimi relativi alla diagnostica. Disattiva l\'opzione, se lo preferisci.</string>
     <string name="settings.feedback.email">Invia commenti</string>
 
     <!-- Multi Selection -->

diff --git a/...java/org/alfresco/mobile/android/application/extension/tools/DeveloperSessionManager.java b/...java/org/alfresco/mobile/android/application/extension/tools/DeveloperSessionManager.java
@@ -31,6 +31,7 @@
 import org.alfresco.mobile.android.api.session.authentication.OAuthData;
 import org.alfresco.mobile.android.api.session.authentication.impl.OAuth2DataImpl;
 import org.alfresco.mobile.android.api.utils.IOUtils;
+import org.alfresco.mobile.android.async.session.RequestSessionEvent;
 import org.alfresco.mobile.android.platform.AlfrescoNotificationManager;
 import org.alfresco.mobile.android.platform.SessionManager;
 import org.alfresco.mobile.android.platform.accounts.AlfrescoAccount;
@@ -42,6 +43,8 @@
 import android.os.Bundle;
 import android.os.Environment;
 
+import com.squareup.otto.Subscribe;
+
 public class DeveloperSessionManager extends SessionManager
 {
     public static final String OAUTH_URL = "oauth_url";
@@ -84,6 +87,15 @@ protected DeveloperSessionManager(Context context)
         super(context);
     }
 
+    // ///////////////////////////////////////////////////////////////////////////
+    // EVENTS RECEIVER
+    // ///////////////////////////////////////////////////////////////////////////
+    @Subscribe
+    public void onSessionRequested(RequestSessionEvent event)
+    {
+        super.onSessionRequested(event);
+    }
+
     // ///////////////////////////////////////////////////////////////////////////
     // SETTINGS
     // ///////////////////////////////////////////////////////////////////////////