mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-12-18 06:32:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix bugs

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-23 20:53:10 +02:00
parent e4b020575d
commit cbfa3c3f18
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -15,8 +15,8 @@ android {
targetSdkVersion 27 targetSdkVersion 27
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionCode 41 versionCode 44
versionName "2.0.1beta2" versionName "2.1.0beta1"
flavorDimensions "default" flavorDimensions "default"

10
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View file

@ -831,10 +831,14 @@ public class ChatController extends BaseController implements MessagesListAdapte
bundle.putBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, true); bundle.putBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, true);
} }
Intent callIntent = new Intent(getActivity(), MagicCallActivity.class); if (getActivity() != null) {
callIntent.putExtras(bundle); Intent callIntent = new Intent(getActivity(), MagicCallActivity.class);
callIntent.putExtras(bundle);
return callIntent; return callIntent;
} else {
return null;
}
} else { } else {
return null; return null;
} }

15
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View file

@ -571,8 +571,9 @@ public class ContactsController extends BaseController implements SearchView.OnQ
} }
searchItem.setVisible(newUserItemList.size() > 0); searchItem.setVisible(newUserItemList.size() > 0);
swipeRefreshLayout.setRefreshing(false); if (swipeRefreshLayout != null) {
swipeRefreshLayout.setRefreshing(false);
}
if (isNewConversationView) { if (isNewConversationView) {
checkAndHandleBottomButtons(); checkAndHandleBottomButtons();
@ -604,10 +605,10 @@ public class ContactsController extends BaseController implements SearchView.OnQ
break; break;
} }
swipeRefreshLayout.setRefreshing(false); if (swipeRefreshLayout != null) {
swipeRefreshLayout.setRefreshing(false);
}
} }
;
dispose(contactsQueryDisposable); dispose(contactsQueryDisposable);
@ -615,7 +616,9 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@Override @Override
public void onComplete() { public void onComplete() {
swipeRefreshLayout.setRefreshing(false); if (swipeRefreshLayout != null) {
swipeRefreshLayout.setRefreshing(false);
}
dispose(contactsQueryDisposable); dispose(contactsQueryDisposable);
alreadyFetching = false; alreadyFetching = false;

2
app/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.java
View file

@ -60,7 +60,7 @@ public class PackageReplacedReceiver extends BroadcastReceiver {
intent.getAction().equals("android.intent.action.MY_PACKAGE_REPLACED")) { intent.getAction().equals("android.intent.action.MY_PACKAGE_REPLACED")) {
try { try {
PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0); PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
if (packageInfo.versionCode > 42 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (packageInfo.versionCode > 43 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager notificationManager = NotificationManager notificationManager =
(NotificationManager) context.getSystemService(Context (NotificationManager) context.getSystemService(Context
.NOTIFICATION_SERVICE); .NOTIFICATION_SERVICE);