Batch of crash fixes and tweaks

.gitignore

@@ -26,17 +26,18 @@ local.properties
 *.iml
 *.ipr
 *.iws
-**/.idea/shelf
-**/.idea/workspace.xml
-**/.idea/tasks.xml
-**/.idea/datasources.xml
-**/.idea/dataSources.ids
-**/.idea/gradle.xml
-**/.idea/misc.xml
-**/.idea/modules.xml
-**/.idea/libraries
-**/.idea/dictionaries
-**/.idea/runConfigurations.xml
+**/.idea/
+
+# IDEA/Android Studio Ignore exceptions
+!/.idea/vcs.xml
+!/.idea/fileTemplates/
+!/.idea/inspectionProfiles/
+!/.idea/scopes/
+!/.idea/codeStyleSettings.xml
+!/.idea/.name
+!/.idea/encodings.xml
+!/.idea/copyright/
+!/.idea/compiler.xml
 
 # OSX
 *.DS_Store

.travis.yml

@@ -23,7 +23,7 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-25.0.0
+    - build-tools-25.0.2
 
     # The SDK version used to compile your project
     - android-25

CONTRIBUTORS.md

@@ -0,0 +1,6 @@
+Connfa is brought to you by:
+
+ * [Lemberg Solutions](http://lemberg.co.uk) - [@lemberg](https://github.com/lemberg)
+ * Sebastiano Poggi - [@rock3r](https://github.com/rock3r)
+ * Francesco Pontillo - [@frapontillo](https://github.com/frapontillo)
+ * Roberto Orgiu - [@tiwiz](https://github.com/tiwiz)

README.md

@@ -1,3 +1,7 @@
-Documentation is available on [http://connfa.com/](http://connfa.com/)
+# Connfa
 
-Project is supported by [Lemberg Solutions](http://lemberg.co.uk)
+Connfa is an open source platform for conferences to provide web and native apps to their attendees. Documentation is available on [http://connfa.com/](http://connfa.com/). The project is supported by [Lemberg Solutions](http://lemberg.co.uk) and by independent contributors (see CONTRIBUTORS.md).
+
+# Setting up the app
+
+See [`docs/setup.md`](docs/setup.md).

app/build.gradle

@@ -1,5 +1,3 @@
-apply from: '../dependencies.gradle'
-
 buildscript {
     repositories {
         maven { url 'https://maven.fabric.io/public' }
@@ -72,6 +70,10 @@ android {
                 .or(buildProperties.env['BASE_URL'])
                 .string
 
+        resValueString 'social_query', buildProperties.application['socialQuery']
+                .or('#AndroidDev')
+                .string
+
     }
 
     if (System.getenv('CI') == null) {
@@ -97,6 +99,8 @@ android {
 }
 
 dependencies {
+    compile project(':drupalSDK')
+
     compile libraries.app.annotations
     compile libraries.app.gson
     compile libraries.app.volley
@@ -114,8 +118,7 @@ dependencies {
     compile(libraries.app.crashlytics) {
         transitive = true
     }
-    compile project(':drupalSDK')
-    compile libraries.app.twitter
+    compile libraries.app.tweetUi
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
 
   <application
     android:name="com.connfa.ConnfaApplication"
-    android:theme="@style/Theme.DrupalCon.Home"
+    android:theme="@style/Theme.Connfa.Home"
     android:allowBackup="true"
     android:fullBackupContent="false"
     android:icon="@drawable/ic_launcher"
@@ -20,7 +20,7 @@
 
     <activity
       android:name="com.connfa.ui.activity.SplashActivity"
-      android:theme="@style/Theme.DrupalCon.Home"
+      android:theme="@style/Theme.Connfa.Home"
       android:label="@string/app_name"
       android:screenOrientation="portrait">
       <intent-filter>
@@ -31,23 +31,29 @@
 
     <activity
       android:name="com.connfa.ui.activity.HomeActivity"
-      android:theme="@style/Theme.DrupalCon.Home"
+      android:theme="@style/Theme.Connfa.Home"
       android:launchMode="singleTask"
       android:screenOrientation="portrait" />
 
     <activity
       android:name="com.connfa.ui.activity.SpeakerDetailsActivity"
-      android:theme="@style/Theme.DrupalCon.Speaker"
+      android:theme="@style/Theme.Connfa.Speaker"
       android:screenOrientation="portrait" />
 
     <activity
       android:name="com.connfa.ui.activity.AboutDetailsActivity"
-      android:theme="@style/Theme.DrupalCon.About"
+      android:theme="@style/Theme.Connfa.About"
       android:screenOrientation="portrait" />
 
     <activity
       android:name="com.connfa.ui.activity.EventDetailsActivity"
-      android:theme="@style/Theme.DrupalCon.Event"
+      android:theme="@style/Theme.Connfa.Event"
+      android:screenOrientation="portrait" />
+
+    <activity
+      android:name="com.connfa.social.SocialFeedActivity"
+      android:label="@string/activity_social_feed"
+      android:theme="@style/Theme.Connfa.SocialFeed"
       android:screenOrientation="portrait" />
 
     <receiver android:name="com.connfa.receiver.NotifyReceiver" />

app/src/main/java/com/connfa/ConnfaApplication.java

@@ -10,8 +10,9 @@
 import com.ls.drupal.DrupalClient;
 import com.ls.http.base.BaseRequest;
 import com.ls.util.image.DrupalImageView;
-import com.twitter.sdk.android.Twitter;
 import com.twitter.sdk.android.core.TwitterAuthConfig;
+import com.twitter.sdk.android.core.TwitterCore;
+import com.twitter.sdk.android.tweetui.TweetUi;
 
 import io.fabric.sdk.android.Fabric;
 import timber.log.Timber;
@@ -55,6 +56,6 @@ private void setupFabric() {
                 getString(R.string.api_value_twitter_api_key),
                 getString(R.string.api_value_twitter_secret)
         );
-        Fabric.with(this, new Crashlytics(), new Twitter(authConfig));
+        Fabric.with(this, new Crashlytics(), new TwitterCore(authConfig), new TweetUi());
     }
 }

app/src/main/java/com/connfa/model/UpdatesManager.java

@@ -49,11 +49,11 @@ public class UpdatesManager {
     public static int convertEventIdToEventModePos(int eventModePos) {
         switch (eventModePos) {
             case PROGRAMS_REQUEST_ID:
-                return DrawerManager.EventMode.Program.ordinal();
+                return DrawerManager.EventMode.PROGRAM.ordinal();
             case BOFS_REQUEST_ID:
-                return DrawerManager.EventMode.Bofs.ordinal();
+                return DrawerManager.EventMode.BOFS.ordinal();
             case SOCIALS_REQUEST_ID:
-                return DrawerManager.EventMode.Social.ordinal();
+                return DrawerManager.EventMode.SOCIAL.ordinal();
         }
         return 0;
     }

app/src/main/java/com/connfa/model/dao/EventDao.java

@@ -368,7 +368,7 @@ public List<SpeakerDetailsEvent> getEventsBySpeakerId(long speakerId) {
                 event.setEventName(cursor.getString(cursor.getColumnIndex("_name")));
                 event.setLevelName(cursor.getString(cursor.getColumnIndex("level_name")));
                 event.setTrackName(cursor.getString(cursor.getColumnIndex("track_name")));
-                event.setDate(getContext(), cursor.getLong(cursor.getColumnIndex( "_date")));
+                event.setDate(getContext(), cursor.getLong(cursor.getColumnIndex("_date")));
                 event.setFavorite(cursor.getInt(cursor.getColumnIndex("_favorite")) == 1);
                 event.setPlace(cursor.getString(cursor.getColumnIndex("_place")));
 

app/src/main/java/com/connfa/model/database/AbstractEntityDAO.java

@@ -53,7 +53,7 @@ private boolean containsData(E entity) {
     public final int deleteData(I entity) {
         ILAPIDBFacade facade = getFacade();
         return facade.delete(getTableName(), getSearchCondition(),
-                             getSearchConditionArguments(entity)
+                getSearchConditionArguments(entity)
         );
     }
 
@@ -64,7 +64,7 @@ public final int deleteDataSafe(I entity) {
             facade.open();
 
             return facade.delete(getTableName(), getSearchCondition(),
-                                 getSearchConditionArguments(entity)
+                    getSearchConditionArguments(entity)
             );
         } finally {
             facade.close();
@@ -110,7 +110,7 @@ private List<E> getData(String condition, String[] arguments) {
 
         ILAPIDBFacade facade = getFacade();
         Cursor cursor = facade.getAllRecords(getTableName(), null,
-                                             condition, arguments
+                condition, arguments
         );
 
         boolean moved = cursor.moveToFirst();
@@ -293,7 +293,7 @@ private int updateData(E entity) {
 
         ILAPIDBFacade facade = getFacade();
         return facade.update(getTableName(), getSearchCondition(),
-                             getSearchConditionArguments(entity.getId()), values
+                getSearchConditionArguments(entity.getId()), values
         );
     }
 

app/src/main/java/com/connfa/model/database/DatabaseFacade.java

@@ -14,7 +14,7 @@ class DatabaseFacade implements ILAPIDBFacade {
 
     private final Context context;
     private int openCounter = 0;
-    
+
     DatabaseFacade(Context context, DBInfo dbInfo) {
         this.context = context;
         this.dbInfo = dbInfo;
@@ -136,26 +136,26 @@ public int clearTable(String table) {
 
     public Cursor getAllRecords(String table, String[] columns, String selection) {
         return db.query(true,
-                        table,
-                        columns,
-                        selection,// selection
-                        null,// selection args
-                        null,// groupBy
-                        null,// having
-                        null,// order by
-                        null);
+                table,
+                columns,
+                selection,// selection
+                null,// selection args
+                null,// groupBy
+                null,// having
+                null,// order by
+                null);
     }
 
     public Cursor getAllRecords(String table, String[] columns, String selection, String[] selectionArgs) {
         return db.query(true,
-                        table,
-                        columns,
-                        selection,// selection
-                        selectionArgs,// selection args
-                        null,// groupBy
-                        null,// having
-                        null,// order by
-                        null);
+                table,
+                columns,
+                selection,// selection
+                selectionArgs,// selection args
+                null,// groupBy
+                null,// having
+                null,// order by
+                null);
     }
 
     public String getQuery(int resId) {

app/src/main/java/com/connfa/receiver/NotifyReceiver.java

@@ -9,38 +9,94 @@
 import android.support.v4.app.NotificationCompat;
 
 import com.connfa.R;
+import com.connfa.model.Model;
+import com.connfa.model.data.EventDetailsEvent;
+import com.connfa.model.data.Speaker;
+import com.connfa.model.managers.EventManager;
+import com.connfa.model.managers.SpeakerManager;
 import com.connfa.ui.activity.EventDetailsActivity;
 import com.connfa.ui.activity.HomeActivity;
 import com.connfa.utils.AlarmTask;
 
+import java.util.List;
+
+import static android.R.attr.id;
+
 public class NotifyReceiver extends BroadcastReceiver {
 
     @Override
-    public void onReceive(Context context, Intent intent) {
-        long eventId = intent.getLongExtra(AlarmTask.EXTRA_ID, -1);
-        long day = intent.getLongExtra(AlarmTask.EXTRA_DAY, -1);
-        String text = intent.getStringExtra(AlarmTask.EXTRA_TEXT);
-        showNotification(context, eventId, day, text);
+    public void onReceive(final Context context, Intent intent) {
+         long eventId = intent.getLongExtra(AlarmTask.EXTRA_ID, -1);
+         long day = intent.getLongExtra(AlarmTask.EXTRA_DAY, -1);
+
+        SpeakerManager speakerManager = Model.getInstance().getSpeakerManager();
+        List<Speaker> speakerList = speakerManager.getSpeakersByEventId(eventId);
+
+        EventManager eventManager = Model.getInstance().getEventManager();
+        EventDetailsEvent event = eventManager.getEventById(eventId);
+        if (event != null) {
+            showNotification(context, event, speakerList, day);
+        }
+
     }
 
-    private void showNotification(Context context, long id, long day, String text) {
-        String title = context.getString(R.string.dont_miss_it);
+    private void showNotification(Context context, EventDetailsEvent event, List<Speaker> speakerList, long day) {
+        String title = event.getEventName();
         int icon = android.R.drawable.ic_dialog_info;
 
         Intent intent = new Intent(context, HomeActivity.class);
         intent.putExtra(EventDetailsActivity.EXTRA_EVENT_ID, id);
         intent.putExtra(EventDetailsActivity.EXTRA_DAY, day);
         PendingIntent contentIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
-        builder.setSmallIcon(icon);
-        builder.setContentTitle(title);
-        builder.setContentText(text);
-        builder.setAutoCancel(true);
-        builder.setContentIntent(contentIntent);
-        builder.setDefaults(Notification.DEFAULT_ALL);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
+                .setSmallIcon(icon)
+                .setContentTitle(title)
+                .setContentText(createContentText(context, event))
+                .setAutoCancel(true)
+                .setContentIntent(contentIntent)
+                .setStyle(new NotificationCompat.BigTextStyle()
+                                  .bigText(createBigText(context, event, speakerList)))
+                .setDefaults(Notification.DEFAULT_ALL);
 
         NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         manager.notify(0, builder.build());
     }
+
+    private CharSequence createContentText(Context context, EventDetailsEvent event) {
+        return context.getString(R.string.start_in_5_minutes_in_place, event.getPlace());
+    }
+
+    private CharSequence createBigText(Context context, EventDetailsEvent event, List<Speaker> speakerList) {
+        String speakersNames = createSpeakersNames(speakerList);
+        return context.getString(R.string.start_in_5_minutes_in_place_speakers,  event.getPlace(), speakersNames);
+    }
+
+    private String createSpeakersNames(List<Speaker> speakerList) {
+        if (speakerList.isEmpty()) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder("by ");
+        for (int i = 0; i < speakerList.size(); i++) {
+            sb.append(createSpeakerFullName(speakerList.get(i)));
+            if (isBeforeSecondToLast(speakerList, i)) {
+                sb.append(", ");
+            } else if (isSecondToLast(speakerList, i)) {
+                sb.append(" and ");
+            }
+        }
+        return sb.toString();
+    }
+
+    private boolean isBeforeSecondToLast(List<Speaker> speakerList, int i) {
+        return i < speakerList.size() - 2;
+    }
+
+    private boolean isSecondToLast(List<Speaker> speakerList, int i) {
+        return i == speakerList.size() - 2;
+    }
+
+    private String createSpeakerFullName(Speaker speaker) {
+        return speaker.getFirstName() + " " + speaker.getLastName();
+    }
 }