File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
auth/app/src/main/res/layout
storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change 31
31
android : layout_height =" wrap_content"
32
32
android : ellipsize =" end"
33
33
android : maxLines =" 1"
34
+ android : singleLine =" true"
34
35
android : text =" @string/token_null" />
35
36
36
37
<TextView
Original file line number Diff line number Diff line change 22
22
import android .content .Context ;
23
23
import android .content .Intent ;
24
24
import android .net .Uri ;
25
+ import android .os .Build ;
25
26
import android .os .Bundle ;
26
27
import android .os .Environment ;
27
28
import android .provider .MediaStore ;
@@ -217,9 +218,12 @@ public void onFailure(@NonNull Exception exception) {
217
218
218
219
@ AfterPermissionGranted (RC_STORAGE_PERMS )
219
220
private void launchCamera () {
221
+ Log .d (TAG , "launchCamera" );
222
+
220
223
// Check that we have permission to read images from external storage.
221
224
String perm = Manifest .permission .READ_EXTERNAL_STORAGE ;
222
- if (!EasyPermissions .hasPermissions (this , perm )) {
225
+ if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .M
226
+ && !EasyPermissions .hasPermissions (this , perm )) {
223
227
EasyPermissions .requestPermissions (this , getString (R .string .rationale_storage ),
224
228
RC_STORAGE_PERMS , perm );
225
229
return ;
You can’t perform that action at this time.
0 commit comments