Resizing ongoingcall screen and permission utils cleanup

muminsom · Oct 4, 2020 · f839e42 · f839e42
1 parent df98a13
commit f839e42
Show file tree

Hide file tree

Showing 22 changed files with 150 additions and 144 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.chooloo.www.callmanager"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 44
-        versionName "v0.6.0"
+        versionCode 45
+        versionName "v0.6.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {

diff --git a/app/src/main/java/com/chooloo/www/callmanager/adapter/RecentsAdapter.java b/app/src/main/java/com/chooloo/www/callmanager/adapter/RecentsAdapter.java
@@ -13,7 +13,9 @@
 import com.chooloo.www.callmanager.listener.OnItemLongClickListener;
 import com.chooloo.www.callmanager.database.entity.RecentCall;
 import com.chooloo.www.callmanager.ui.ListItemHolder;
+import com.chooloo.www.callmanager.util.PhoneNumberUtils;
 import com.chooloo.www.callmanager.util.RelativeTime;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
 
 import java.util.Date;
 import java.util.Dictionary;
@@ -64,6 +66,7 @@ public void onBindViewHolder(ListItemHolder holder, Cursor cursor) {
         Date date = recentCall.getCallDate();
 
         if (callerName == null) callerName = phoneNumber;
+//            callerName = PhoneNumberUtils.formatPhoneNumber(mContext, phoneNumber);
 
         // hide header
         holder.header.setVisibility(View.GONE);

diff --git a/app/src/main/java/com/chooloo/www/callmanager/cursorloader/FavoritesAndContactsLoader.java b/app/src/main/java/com/chooloo/www/callmanager/cursorloader/FavoritesAndContactsLoader.java
@@ -9,15 +9,14 @@
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 
-import com.chooloo.www.callmanager.util.Utilities;
+import com.chooloo.www.callmanager.util.PermissionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import timber.log.Timber;
 
 import static android.Manifest.permission.READ_CONTACTS;
-import static com.chooloo.www.callmanager.util.PermissionUtils.checkPermissionGranted;
 
 /**
  * Extends the basic ContactsCursorLoader but also adds the favourite contacts to it
@@ -92,7 +91,7 @@ private Cursor loadContacts() {
      * @return The cursor containing the favorites
      */
     private Cursor loadFavorites() {
-        checkPermissionGranted(getContext(), READ_CONTACTS, true);
+        PermissionUtils.checkPermissionsGranted(getContext(), new String[]{READ_CONTACTS}, true);
         String selection = ContactsCursorLoader.COLUMN_STARRED + " = 1";
         return getContext().getContentResolver().query(
                 buildFavoritesUri(),

diff --git a/app/src/main/java/com/chooloo/www/callmanager/ui/activity/ContactActivity.java b/app/src/main/java/com/chooloo/www/callmanager/ui/activity/ContactActivity.java
@@ -128,7 +128,7 @@ public void actionFav(ImageView view) {
                 ContactUtils.setContactIsFavorite(this, Long.toString(mContact.getContactId()), true);
             }
         } else {
-            PermissionUtils.askForPermission(this, WRITE_CONTACTS);
+            PermissionUtils.askForPermissions(this, new String[]{WRITE_CONTACTS});
             Toast.makeText(this, "I dont have the permission to do that :(", Toast.LENGTH_LONG).show();
         }
     }

diff --git a/app/src/main/java/com/chooloo/www/callmanager/ui/activity/MainActivity.java b/app/src/main/java/com/chooloo/www/callmanager/ui/activity/MainActivity.java
@@ -43,6 +43,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

diff --git a/app/src/main/java/com/chooloo/www/callmanager/ui/activity/OngoingCallActivity.java b/app/src/main/java/com/chooloo/www/callmanager/ui/activity/OngoingCallActivity.java
@@ -16,7 +16,6 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
-import android.provider.ContactsContract;
 import android.telecom.Call;
 import android.view.KeyEvent;
 import android.view.View;
@@ -25,6 +24,7 @@
 import android.view.WindowManager;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -61,8 +61,6 @@
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputEditText;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -73,7 +71,11 @@
 import butterknife.OnClick;
 import timber.log.Timber;
 
+import static android.Manifest.permission.SEND_SMS;
 import static android.app.Notification.EXTRA_NOTIFICATION_ID;
+import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
 import static com.chooloo.www.callmanager.util.BiometricUtils.showBiometricPrompt;
 
 @SuppressLint("ClickableViewAccessibility")
@@ -151,6 +153,7 @@ public class OngoingCallActivity extends AbsThemeActivity implements DialpadFrag
     @BindView(R.id.reject_btn) FloatingActionButton mRejectButton;
 
     // Image Views
+    @BindView(R.id.caller_image_layout) FrameLayout mImageLayout;
     @BindView(R.id.image_placeholder) ImageView mPlaceholderImage;
     @BindView(R.id.image_photo) ImageView mPhotoImage;
     @BindView(R.id.button_hold) ImageView mHoldButton;
@@ -461,9 +464,9 @@ public void cancelTimer(View view) {
      */
     @OnClick(R.id.button_floating_send_sms)
     public void setSmsOverlay(View view) {
-        if (PermissionUtils.checkPermissionGranted(this, Manifest.permission.SEND_SMS, true)) {
+        if (PermissionUtils.checkPermissionsGranted(this, new String[]{SEND_SMS}, true)) {
             setOverlay(mSendSmsOverlay);
-            mSendSmsButton.setVisibility(View.VISIBLE);
+            mSendSmsButton.setVisibility(VISIBLE);
             mSendSmsOverlay.setOnTouchListener(mSmsOverlaySwipeListener);
         }
     }
@@ -542,18 +545,22 @@ private void endCall() {
      * Display the information about the caller
      */
     private void displayInformation() {
+        // get caller contact
         Contact callerContact = CallManager.getDisplayContact(this);
+
+        // set callerName
         String callerName = callerContact.getName();
-        if (callerName == null) {
-            Timber.i("SETTING CALLER NAME " + callerName);
+        if (callerName == null)
             callerName = PhoneNumberUtils.formatPhoneNumber(this, callerContact.getMainPhoneNumber());
-        }
 
+        // apply details to layout
         mCallerText.setText(callerName);
         if (callerContact.getPhotoUri() != null) {
-            mPlaceholderImage.setVisibility(View.INVISIBLE);
-            mPhotoImage.setVisibility(View.VISIBLE);
+            mPlaceholderImage.setVisibility(INVISIBLE);
+            mPhotoImage.setVisibility(VISIBLE);
             mPhotoImage.setImageURI(Uri.parse(callerContact.getPhotoUri()));
+        } else {
+            mImageLayout.setVisibility(GONE);
         }
     }
 
@@ -623,11 +630,11 @@ private void switchToCallingUI() {
 
         // Change the buttons layout
         mAnswerButton.hide();
-        mHoldButton.setVisibility(View.VISIBLE);
-        mMuteButton.setVisibility(View.VISIBLE);
-        mKeypadButton.setVisibility(View.VISIBLE);
-        mSpeakerButton.setVisibility(View.VISIBLE);
-//        mAddCallButton.setVisibility(View.VISIBLE);
+        mHoldButton.setVisibility(VISIBLE);
+        mMuteButton.setVisibility(VISIBLE);
+        mKeypadButton.setVisibility(VISIBLE);
+        mSpeakerButton.setVisibility(VISIBLE);
+//        mAddCallButton.setVisibility(VISIBLE);
         moveRejectButtonToMiddle();
     }
 
@@ -690,7 +697,7 @@ private void hideButtons() {
         assert mFloatingCancelSMS != null;
         mFloatingCancelSMS.hide();
         mFloatingCancelTimerButton.hide();
-        mSendSmsButton.setVisibility(View.GONE);
+        mSendSmsButton.setVisibility(GONE);
     }
 
     /**
@@ -713,15 +720,15 @@ private void setLayerEnabled(@NotNull ViewGroup layer, boolean isEnabled) {
                 if (v instanceof FloatingActionButton) {
                     ((FloatingActionButton) v).show();
                 } else {
-                    v.setVisibility(View.VISIBLE);
+                    v.setVisibility(VISIBLE);
                 }
             } else { // If we don't
                 if (v instanceof FloatingActionButton) { // Make it non-clickable
                     ((FloatingActionButton) v).hide();
                 } else if (v instanceof Button) {
-                    v.setVisibility(View.GONE);
+                    v.setVisibility(GONE);
                 } else { // Don't move any other views that are constrained to it
-                    v.setVisibility(View.INVISIBLE);
+                    v.setVisibility(INVISIBLE);
                 }
                 v.setHovered(false);
             }

diff --git a/app/src/main/java/com/chooloo/www/callmanager/ui/dialog/ImportSpreadsheetDialog.java b/app/src/main/java/com/chooloo/www/callmanager/ui/dialog/ImportSpreadsheetDialog.java
@@ -171,7 +171,7 @@ public void onEditNameIndex(Editable editable) {
      * Shows a file chooser for the excel file
      */
     private void showFileChooser() {
-        PermissionUtils.checkPermissionGranted(getActivity(), READ_EXTERNAL_STORAGE, true);
+        PermissionUtils.checkPermissionsGranted(getActivity(), new String[]{READ_EXTERNAL_STORAGE}, true);
         new FileChooserDialog.Builder(getFragmentManager())
                 .onFileSelected(this)
                 .extensionsFilter(".xls")

diff --git a/app/src/main/java/com/chooloo/www/callmanager/ui/fragment/RecentsFragment.java b/app/src/main/java/com/chooloo/www/callmanager/ui/fragment/RecentsFragment.java
@@ -199,7 +199,7 @@ private void showRecentPopup(RecentCall recentCall) {
                 contactDialog.dismiss();
             } else {
                 Toast.makeText(mContext, "I dont have the permission", Toast.LENGTH_LONG).show();
-                PermissionUtils.askForPermission(getActivity(), WRITE_CALL_LOG);
+                PermissionUtils.askForPermissions(getActivity(), new String[]{WRITE_CALL_LOG});
                 contactDialog.dismiss();
             }
         });

diff --git a/app/src/main/java/com/chooloo/www/callmanager/ui/fragment/SettingsFragment.java b/app/src/main/java/com/chooloo/www/callmanager/ui/fragment/SettingsFragment.java
@@ -111,7 +111,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         ListPreference simSelectionPreference = (ListPreference) findPreference(getString(R.string.pref_sim_select_key));
         simSelectionPreference.setOnPreferenceChangeListener(listChangeListener);
 
-        PermissionUtils.checkPermissionGranted(getContext(), READ_PHONE_STATE, true);
+        PermissionUtils.checkPermissionsGranted(getContext(), new String[]{READ_PHONE_STATE}, true);
         setupSimSelection();
     }
 
@@ -124,7 +124,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     }
 
     private void setupSimSelection() {
-        if (!PermissionUtils.checkPermissionGranted(getContext(), READ_PHONE_STATE, true)) {
+        if (!PermissionUtils.checkPermissionsGranted(getContext(), new String[]{READ_PHONE_STATE}, true)) {
             Toast.makeText(getContext(), "No permission, please give permission to read phone state", Toast.LENGTH_LONG).show();
             return;
         }

diff --git a/app/src/main/java/com/chooloo/www/callmanager/ui/fragment/base/AbsCursorFragment.java b/app/src/main/java/com/chooloo/www/callmanager/ui/fragment/base/AbsCursorFragment.java
@@ -11,7 +11,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -22,11 +21,6 @@
 import com.chooloo.www.callmanager.adapter.AbsFastScrollerAdapter;
 import com.chooloo.www.callmanager.ui.FastScroller;
 import com.chooloo.www.callmanager.util.PermissionUtils;
-import com.chooloo.www.callmanager.util.Utilities;
-import com.chooloo.www.callmanager.viewmodel.SharedDialViewModel;
-import com.chooloo.www.callmanager.viewmodel.SharedSearchViewModel;
-
-import java.util.Optional;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -110,10 +104,7 @@ public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State
         mRecyclerView.setLayoutManager(mLayoutManager);
 
         // refresh layout
-        mRefreshLayout.setOnRefreshListener(() -> {
-            LoaderManager.getInstance(AbsCursorFragment.this).restartLoader(LOADER_ID, null, AbsCursorFragment.this);
-            load();
-        });
+        mRefreshLayout.setOnRefreshListener(this::load);
 
         togglePermissionButton();
         load(mPhoneNumber, mContactName);
@@ -157,7 +148,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
     @OnClick(R.id.enable_permission_btn)
     public void enablePermissionClick() {
-        requestPermissions(mRequiredPermissions, 1);
+        PermissionUtils.askForPermissions(this, mRequiredPermissions);
     }
 
     // -- Loader -- //
@@ -169,9 +160,8 @@ public void enablePermissionClick() {
      * @param contactName name filter
      */
     public void load(@Nullable String phoneNumber, @Nullable String contactName) {
-        if (PermissionUtils.checkPermissionsGranted(mContext, mRequiredPermissions, false)) {
+        if (PermissionUtils.checkPermissionsGranted(mContext, mRequiredPermissions, false))
             runLoader(phoneNumber, contactName);
-        }
     }
 
     public void load() {

diff --git a/app/src/main/java/com/chooloo/www/callmanager/util/CallManager.java b/app/src/main/java/com/chooloo/www/callmanager/util/CallManager.java
@@ -52,7 +52,7 @@ public static void call(@NotNull Activity activity, @NotNull String number) {
                 int simCard = getSimSelection(activity);
 
                 // create call intent
-                Intent callIntent = new Intent(Intent.ACTION_CALL, Uri.parse("tel: " + Uri.encode(Utilities.getOnlyNumbers(number))));
+                Intent callIntent = new Intent(Intent.ACTION_CALL, Uri.parse("tel: " + Uri.encode(number)));
 
                 // add sim selection to call intent
                 if (phoneAccountHandleList != null && !phoneAccountHandleList.isEmpty())

diff --git a/app/src/main/java/com/chooloo/www/callmanager/util/ContactUtils.java b/app/src/main/java/com/chooloo/www/callmanager/util/ContactUtils.java
@@ -21,6 +21,7 @@
 import static android.Manifest.permission.READ_CONTACTS;
 import static android.Manifest.permission.WRITE_CONTACTS;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static com.chooloo.www.callmanager.util.PermissionUtils.checkPermissionsGranted;
 
 public class ContactUtils {
 
@@ -41,7 +42,7 @@ public static Contact getContact(@NonNull Context context, String phoneNumber, S
         // if phone number is empty, it's a private number
         if (phoneNumber.isEmpty() && (name == null || name.isEmpty())) return PRIVATE;
         // check for read contacts permission, ask for it if necessary
-        if (!PermissionUtils.checkPermissionGranted(context, READ_CONTACTS, true)) return UNKNOWN;
+        if (!checkPermissionsGranted(context, new String[]{READ_CONTACTS}, true)) return UNKNOWN;
         // initiate contact cursor
         Cursor cursor = new ContactsCursorLoader(context, phoneNumber, name).loadInBackground();
         // handle null cursor
@@ -137,7 +138,7 @@ public static void deleteContact(Activity activity, long contactId) {
     public static void setContactIsFavorite(Activity activity, String contactId, boolean isSetFavorite) {
         try {
             int num = isSetFavorite ? 1 : 0; // convert boolean to num
-            if (PermissionUtils.checkPermissionGranted(activity, WRITE_CONTACTS, true)) {
+            if (PermissionUtils.checkPermissionsGranted(activity, new String[]{WRITE_CONTACTS}, true)) {
                 ContentValues v = new ContentValues();
                 v.put(ContactsContract.Contacts.STARRED, num);
                 activity.getContentResolver().update(ContactsContract.Contacts.CONTENT_URI, v, ContactsContract.Contacts._ID + "=?", new String[]{contactId + ""});