Commit f83a1b56 authored by DrKLO's avatar DrKLO
parent dff98476
...@@ -80,7 +80,7 @@ android { ...@@ -80,7 +80,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 19 targetSdkVersion 19
versionCode 331 versionCode 332
versionName "1.9.0" versionName "1.9.0"
} }
} }
...@@ -1364,7 +1364,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1364,7 +1364,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
args.putString("videoPath", videoPath); args.putString("videoPath", videoPath);
VideoEditorActivity fragment = new VideoEditorActivity(args); VideoEditorActivity fragment = new VideoEditorActivity(args);
fragment.setDelegate(this); fragment.setDelegate(this);
presentFragment(fragment); presentFragment(fragment, false, true);
} else { } else {
processSendingVideo(videoPath, 0, 0, 0, 0, null); processSendingVideo(videoPath, 0, 0, 0, 0, null);
} }
......
...@@ -629,7 +629,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -629,7 +629,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
count = info.participants.size(); count = info.participants.size();
} }
if (count != 0 && onlineCount > 0) { if (count != 0 && onlineCount > 1) {
onlineText.setText(Html.fromHtml(String.format("%s, <font color='#357aa8'>%d %s</font>", LocaleController.formatPluralString("Members", count), onlineCount, LocaleController.getString("Online", R.string.Online)))); onlineText.setText(Html.fromHtml(String.format("%s, <font color='#357aa8'>%d %s</font>", LocaleController.formatPluralString("Members", count), onlineCount, LocaleController.getString("Online", R.string.Online))));
} else { } else {
onlineText.setText(LocaleController.formatPluralString("Members", count)); onlineText.setText(LocaleController.formatPluralString("Members", count));
......
...@@ -760,15 +760,16 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa ...@@ -760,15 +760,16 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
public void fixLayout() { public void fixLayout() {
if (AndroidUtilities.isTablet()) { if (AndroidUtilities.isTablet()) {
final ViewTreeObserver obs = actionBarLayout.getViewTreeObserver(); actionBarLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
obs.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override @Override
public void onGlobalLayout() { public void onGlobalLayout() {
needLayout(); needLayout();
if (Build.VERSION.SDK_INT < 16) { if (actionBarLayout != null) {
obs.removeGlobalOnLayoutListener(this); if (Build.VERSION.SDK_INT < 16) {
} else { actionBarLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
obs.removeOnGlobalLayoutListener(this); } else {
actionBarLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
}
} }
} }
}); });
......
...@@ -69,7 +69,7 @@ public class AvatarUpdater implements NotificationCenter.NotificationCenterDeleg ...@@ -69,7 +69,7 @@ public class AvatarUpdater implements NotificationCenter.NotificationCenterDeleg
public void openGallery() { public void openGallery() {
try { try {
Intent photoPickerIntent = new Intent(Intent.ACTION_PICK); Intent photoPickerIntent = new Intent(Intent.ACTION_GET_CONTENT);
photoPickerIntent.setType("image/*"); photoPickerIntent.setType("image/*");
parentFragment.getParentActivity().startActivityForResult(photoPickerIntent, 14); parentFragment.getParentActivity().startActivityForResult(photoPickerIntent, 14);
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment