Threema пре 3 година
родитељ
комит
a46f90c004

+ 2 - 2
app/build.gradle

@@ -13,7 +13,7 @@ if (getGradle().getStartParameter().getTaskRequests().toString().contains("Hms")
 }
 
 // version codes
-def app_version = "4.81"
+def app_version = "4.811"
 def beta_suffix = "" // with leading dash
 
 /**
@@ -93,7 +93,7 @@ android {
         vectorDrawables.useSupportLibrary = true
         applicationId "ch.threema.app"
         testApplicationId 'ch.threema.app.test'
-        versionCode 747
+        versionCode 748
         versionName "${app_version}${beta_suffix}"
         resValue "string", "app_name", "Threema"
         // package name used for sync adapter - needs to match mime types below

+ 1 - 1
app/src/main/java/ch/threema/app/camera/CameraFragment.kt

@@ -363,7 +363,7 @@ class CameraFragment : Fragment() {
     /** Declare and bind preview, capture and analysis use cases */
     @SuppressLint("RestrictedApi")
     private fun bindCameraUseCases(): Boolean {
-        if (previewView == null) {
+        if (previewView == null || previewView!!.display == null) {
             return false
         }
 

+ 15 - 11
app/src/main/java/ch/threema/app/fragments/MyIDFragment.java

@@ -295,18 +295,22 @@ public class MyIDFragment extends MainFragment
 	}
 
 	private void setupPicReleaseSpinner() {
-		MaterialAutoCompleteTextView spinner = fragmentView.findViewById(R.id.picrelease_spinner);
-		ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(), R.array.picrelease_choices, android.R.layout.simple_spinner_dropdown_item);
-		spinner.setAdapter(adapter);
-		spinner.setText(adapter.getItem(preferenceService.getProfilePicRelease()), false);
-		spinner.setOnItemClickListener((parent, view, position, id) -> {
-			int oldPosition = preferenceService.getProfilePicRelease();
-			preferenceService.setProfilePicRelease(position);
-			fragmentView.findViewById(R.id.picrelease_config).setVisibility(position == PreferenceService.PROFILEPIC_RELEASE_SOME ? View.VISIBLE : View.GONE);
-			if (position == PreferenceService.PROFILEPIC_RELEASE_SOME && position != oldPosition) {
-				launchProfilePictureRecipientsSelector(view);
+		if (fragmentView != null && preferenceService != null) {
+			MaterialAutoCompleteTextView spinner = fragmentView.findViewById(R.id.picrelease_spinner);
+			if (spinner != null) {
+				ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(), R.array.picrelease_choices, android.R.layout.simple_spinner_dropdown_item);
+				spinner.setAdapter(adapter);
+				spinner.setText(adapter.getItem(preferenceService.getProfilePicRelease()), false);
+				spinner.setOnItemClickListener((parent, view, position, id) -> {
+					int oldPosition = preferenceService.getProfilePicRelease();
+					preferenceService.setProfilePicRelease(position);
+					fragmentView.findViewById(R.id.picrelease_config).setVisibility(position == PreferenceService.PROFILEPIC_RELEASE_SOME ? View.VISIBLE : View.GONE);
+					if (position == PreferenceService.PROFILEPIC_RELEASE_SOME && position != oldPosition) {
+						launchProfilePictureRecipientsSelector(view);
+					}
+				});
 			}
-		});
+		}
 	}
 
 	@Override