Merge branch 'develop' into feature/#123

Conflicts:
	android/app/build.gradle
	android/settings.gradle
	package.json
	src/status_im/chat/handlers.cljs
	src/status_im/chat/subs.cljs


Former-commit-id: dd3eb3c0eb
This commit is contained in:
Roman Volosovskyi
2016-06-23 12:02:39 +03:00
22 changed files with 301 additions and 351 deletions
@@ -23,6 +23,7 @@ import android.content.Context;
import com.bitgo.randombytes.RandomBytesPackage;
import com.BV.LinearGradient.LinearGradientPackage;
import com.centaurwarchief.smslistener.SmsListener;
import com.github.yamill.orientation.OrientationPackage;
import android.util.Log;
@@ -36,7 +37,8 @@ import com.statusim.Jail.JailPackage;
import com.lwansbrough.RCTCamera.*;
import com.i18n.reactnativei18n.ReactNativeI18n;
import io.realm.react.RealmReactPackage;
import android.content.Intent;
import android.content.res.Configuration;
public class MainActivity extends ReactActivity {
@@ -183,7 +185,16 @@ public class MainActivity extends ReactActivity {
new RandomBytesPackage(),
new LinearGradientPackage(),
new RCTCameraPackage(),
new SmsListener(this)
new SmsListener(this),
new OrientationPackage(this)
);
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
Intent intent = new Intent("onConfigurationChanged");
intent.putExtra("newConfig", newConfig);
this.sendBroadcast(intent);
}
}