Skip to content

Commit f003c74

Browse files
UriahShaulMandelUriahShaulMandel
authored
Merge pull request #272 from UriahShaulMandel/google_support
Google support
2 parents c923f80 + f941a6c commit f003c74

File tree

11 files changed

+163
-53
lines changed

11 files changed

+163
-53
lines changed

‎app/build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ android {
2727
versionCode 98
2828
versionName "12.1.2"
2929
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
30+
manifestPlaceholders = [fullApp: "true", notFullApp: "false", recentCalls: "true", notRecentCalls: "false"]
31+
3032
}
3133

3234
buildTypes {
@@ -51,9 +53,15 @@ android {
5153
fDroid {
5254
dimension "updating_mechanism"
5355
}
54-
gPlay{
56+
gPlay {
5557
dimension "updating_mechanism"
5658
applicationIdSuffix ".gp"
59+
manifestPlaceholders = [fullApp: "true", notFullApp: "false", recentCalls: "false", notRecentCalls: "true"]
60+
}
61+
gPlayRecentCalls {
62+
dimension "updating_mechanism"
63+
applicationIdSuffix ".gprc"
64+
manifestPlaceholders = [fullApp: "false", notFullApp: "true", recentCalls: "true", notRecentCalls: "false"]
5765
}
5866
}
5967
compileOptions {

‎app/src/gPlay/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,10 @@
2020
<uses-permission
2121
android:name="android.permission.REQUEST_INSTALL_PACKAGES"
2222
tools:node="remove" />
23+
<uses-permission
24+
android:name="android.permission.WRITE_CALL_LOG"
25+
tools:node="remove" />
26+
<uses-permission
27+
android:name="android.permission.READ_CALL_LOG"
28+
tools:node="remove" />
2329
</manifest>

‎app/src/main/AndroidManifest.xml

Lines changed: 90 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
<uses-permission android:name="android.permission.INTERNET" />
3535
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
3636
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
37-
<uses-permission android:name="android.permission.WRITE_CALL_LOG" />
38-
<uses-permission android:name="android.permission.READ_CALL_LOG" />
3937
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
4038
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
39+
<uses-permission android:name="android.permission.WRITE_CALL_LOG" />
40+
<uses-permission android:name="android.permission.READ_CALL_LOG" />
4141

4242

4343
<uses-permission
@@ -59,6 +59,7 @@
5959

6060
<activity
6161
android:name=".activities.HomeScreenActivity"
62+
android:enabled="${fullApp}"
6263
android:launchMode="singleTask">
6364
<intent-filter>
6465
<action android:name="android.intent.action.MAIN" />
@@ -71,43 +72,65 @@
7172
</activity>
7273
<activity
7374
android:name=".activities.DialerActivity"
75+
76+
android:enabled="${fullApp}"
7477
android:label="@string/dialer">
7578
<intent-filter>
7679
<action android:name="android.intent.action.DIAL" />
7780
</intent-filter>
7881
</activity>
7982
<activity
8083
android:name=".activities.alarms.AlarmsActivity"
84+
85+
android:enabled="${fullApp}"
8186
android:label="@string/alarms" />
8287
<activity
8388
android:name=".activities.alarms.AlarmScreenActivity"
89+
90+
android:enabled="${fullApp}"
8491
android:label="@string/alarm"
8592
android:screenOrientation="portrait" />
8693
<activity
8794
android:name=".activities.alarms.AddAlarmActivity"
95+
96+
android:enabled="${fullApp}"
8897
android:label="@string/add_alarm"
8998
android:screenOrientation="portrait" />
9099
<activity
91100
android:name=".activities.contacts.ContactsActivity"
101+
102+
android:enabled="${fullApp}"
92103
android:label="@string/contacts"
93104
android:windowSoftInputMode="adjustResize" />
94-
<activity android:name=".activities.contacts.SingleContactActivity" />
105+
<activity
106+
android:name=".activities.contacts.SingleContactActivity"
107+
android:enabled="${fullApp}" />
95108
<activity
96109
android:name=".activities.media.SingleVideoActivity"
110+
111+
android:enabled="${fullApp}"
97112
android:label="@string/video" />
98113
<activity
99114
android:name=".activities.TutorialActivity"
115+
116+
android:enabled="${fullApp}"
100117
android:label="@string/video_tutorials"
101118
android:screenOrientation="portrait" />
102119
<activity
103120
android:name=".activities.SOSActivity"
121+
122+
android:enabled="${fullApp}"
104123
android:label="@string/sos" />
105124

106125
<activity
107126
android:name=".activities.SettingsActivity"
127+
128+
android:enabled="${fullApp}"
108129
android:label="@string/settings" />
109130
<activity
110131
android:name=".activities.NotificationsActivity"
132+
133+
android:enabled="${fullApp}"
111134
android:label="@string/notifications" />
112135
<activity
113136
android:name=".activities.FakeLauncherActivity"
@@ -122,94 +145,123 @@
122145
<activity android:name=".activities.PermissionActivity" />
123146
<activity
124147
android:name=".activities.RecentActivity"
148+
android:enabled="${recentCalls}"
125149
android:label="@string/recent">
126-
<intent-filter>
127-
<action android:name="android.intent.action.VIEW" />
128-
<action android:name="android.intent.action.DIAL" />
129-
130-
<category android:name="android.intent.category.DEFAULT" />
131-
<category android:name="android.intent.category.BROWSABLE" />
132-
133-
<data android:scheme="tel" />
134-
</intent-filter>
135-
<intent-filter>
136-
<action android:name="android.intent.action.DIAL" />
137-
138-
<category android:name="android.intent.category.DEFAULT" />
139-
</intent-filter>
140150
</activity>
141151
<activity
142152
android:name=".activities.media.PhotosActivity"
153+
154+
android:enabled="${fullApp}"
143155
android:label="@string/photos" />
144156
<activity
145157
android:name=".activities.media.VideosActivity"
158+
159+
android:enabled="${fullApp}"
146160
android:label="@string/videos">
147161
<intent-filter>
148162
<action android:name="android.intent.action.GET_CONTENT" />
149163
<data android:mimeType="video/*" />
150164
<category android:name="android.intent.category.DEFAULT" />
151165
</intent-filter>
152166
</activity>
153-
<activity android:name=".activities.media.SinglePhotoActivity" />
154-
<activity android:name=".activities.contacts.AddContactActivity" />
167+
<activity
168+
android:name=".activities.media.SinglePhotoActivity"
169+
android:enabled="${fullApp}" />
170+
<activity
171+
android:name=".activities.contacts.AddContactActivity"
172+
android:enabled="${fullApp}" />
155173
<activity
156174
android:name=".activities.alarms.AddTimerActivity"
175+
176+
android:enabled="${fullApp}"
157177
android:screenOrientation="portrait" />
158178
<activity
159179
android:name=".activities.AppsActivity"
180+
181+
android:enabled="${fullApp}"
160182
android:label="@string/apps" />
161183
<activity
162184
android:name=".activities.pills.PillsActivity"
185+
186+
android:enabled="${fullApp}"
163187
android:label="@string/pills" />
164188
<activity
165189
android:name=".activities.pills.AddPillActivity"
190+
191+
android:enabled="${fullApp}"
166192
android:screenOrientation="portrait" />
167193
<activity
168194
android:name=".activities.pills.PillScreenActivity"
195+
196+
android:enabled="${fullApp}"
169197
android:screenOrientation="portrait" />
170198
<activity
171199
android:name=".activities.FontChangerActivity"
200+
201+
android:enabled="${fullApp}"
172202
android:screenOrientation="portrait" />
173203
<activity
174204
android:name=".activities.AccessibilityLevelChangerActivity"
205+
206+
android:enabled="${fullApp}"
175207
android:screenOrientation="portrait" />
176208
<activity
177209
android:name=".activities.contacts.ShareActivity"
210+
211+
android:enabled="${fullApp}"
178212
android:windowSoftInputMode="adjustResize" />
179-
<activity android:name=".activities.CreditsActivity" />
213+
<activity
214+
android:name=".activities.CreditsActivity"
215+
android:enabled="${fullApp}" />
180216
<activity
181217
android:name=".activities.YoutubeActivity"
182218
android:screenOrientation="portrait" />
183219
<activity
184220
android:name=".activities.VideoTutorialsActivity"
221+
222+
android:enabled="${fullApp}"
185223
android:label="@string/video_tutorials" />
186224
<activity
187225
android:name=".activities.CrashActivity"
188226
android:label="@string/crash" />
189-
<activity android:name=".activities.KeyboardChangerActivity" />
190-
<activity android:name=".activities.pills.PillTimeSetterActivity" />
227+
<activity
228+
android:name=".activities.KeyboardChangerActivity"
229+
android:enabled="${fullApp}" />
230+
<activity
231+
android:name=".activities.pills.PillTimeSetterActivity"
232+
android:enabled="${fullApp}" />
191233
<activity
192234
android:name=".activities.PhoneActivity"
235+
236+
android:enabled="${fullApp}"
193237
android:label="@string/phone">
194238
<intent-filter>
195239
<action android:name="android.intent.action.VIEW" />
196-
<action android:name="android.intent.action.DIAL" />
197240

198241
<category android:name="android.intent.category.DEFAULT" />
199242
</intent-filter>
200243
</activity>
201244
<activity
202245
android:name=".activities.TechnicalInfoActivity"
246+
247+
android:enabled="${fullApp}"
203248
android:screenOrientation="portrait" />
204-
<activity android:name=".activities.FeedbackActivity" />
205-
<activity android:name=".activities.UpdatesActivity" />
249+
<activity
250+
android:name=".activities.FeedbackActivity"
251+
android:enabled="${fullApp}" />
252+
<activity
253+
android:name=".activities.UpdatesActivity"
254+
android:enabled="${fullApp}" />
206255
<activity
207256
android:name=".activities.Page1EditorActivity"
257+
258+
android:enabled="${fullApp}"
208259
android:label="@string/edit_home_screen" />
209260

210261

211262
<service
212263
android:name=".keyboard.BaldInputMethodService"
264+
android:enabled="${fullApp}"
213265
android:permission="android.permission.BIND_INPUT_METHOD"
214266
android:screenOrientation="landscape"
215267
android:windowSoftInputMode="adjustPan|stateHidden">
@@ -222,6 +274,7 @@
222274
</service>
223275
<service
224276
android:name=".services.NotificationListenerService"
277+
android:enabled="${fullApp}"
225278
android:label="Bald Notification Service"
226279
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
227280
<intent-filter>
@@ -230,23 +283,31 @@
230283
</service>
231284

232285

233-
<receiver android:name=".broadcast_receivers.BootUpBroadcastReceiver">
286+
<receiver
287+
android:name=".broadcast_receivers.BootUpBroadcastReceiver"
288+
android:enabled="${fullApp}">
234289
<intent-filter>
235290
<action android:name="android.intent.action.BOOT_COMPLETED" />
236291
</intent-filter>
237292
</receiver>
238-
<receiver android:name=".broadcast_receivers.LocalChangedReceiver">
293+
<receiver
294+
android:name=".broadcast_receivers.LocalChangedReceiver"
295+
android:enabled="${fullApp}">
239296
<intent-filter>
240297
<action android:name="android.intent.action.LOCALE_CHANGED" />
241298
</intent-filter>
242299
</receiver>
243300
<receiver
244301
android:name=".broadcast_receivers.AlarmReceiver"
302+
android:enabled="${fullApp}"
245303
android:process=":remote" />
246304
<receiver
247305
android:name=".broadcast_receivers.ReminderReceiver"
306+
android:enabled="${fullApp}"
248307
android:process=":remote" />
249-
<receiver android:name=".broadcast_receivers.DownloadManagerReceiver">
308+
<receiver
309+
android:name=".broadcast_receivers.DownloadManagerReceiver"
310+
android:enabled="${fullApp}">
250311
<intent-filter>
251312
<action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
252313
</intent-filter>
@@ -256,6 +317,7 @@
256317
<provider
257318
android:name="androidx.core.content.FileProvider"
258319
android:authorities="${applicationId}.fileprovider"
320+
android:enabled="${fullApp}"
259321
android:exported="false"
260322
android:grantUriPermissions="true">
261323
<meta-data

‎app/src/main/java/com/bald/uriah/baldphone/activities/BaldActivity.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import android.os.Handler;
3030
import android.os.Vibrator;
3131
import android.provider.Settings;
32-
import android.telecom.TelecomManager;
3332
import android.util.Log;
3433
import android.view.View;
3534
import android.view.Window;
@@ -53,7 +52,6 @@
5352
import java.lang.ref.WeakReference;
5453
import java.util.ArrayList;
5554
import java.util.List;
56-
import java.util.Objects;
5755

5856
import static android.Manifest.permission.CALL_PHONE;
5957
import static android.Manifest.permission.CAMERA;
@@ -147,12 +145,14 @@ else if ((requiredPermissions & PERMISSION_NOTIFICATION_LISTENER) == PERMISSION_
147145
return false;
148146
}
149147
if ((requiredPermissions & PERMISSION_WRITE_CALL_LOG) != 0) {
150-
if (ActivityCompat.checkSelfPermission(activity, WRITE_CALL_LOG) != PERMISSION_GRANTED)
151-
return false;
148+
if (!BuildConfig.FLAVOR.equals("gPlay"))
149+
if (ActivityCompat.checkSelfPermission(activity, WRITE_CALL_LOG) != PERMISSION_GRANTED)
150+
return false;
152151
}
153152
if ((requiredPermissions & PERMISSION_READ_CALL_LOG) != 0) {
154-
if (ActivityCompat.checkSelfPermission(activity, READ_CALL_LOG) != PERMISSION_GRANTED)
155-
return false;
153+
if (!BuildConfig.FLAVOR.equals("gPlay"))
154+
if (ActivityCompat.checkSelfPermission(activity, READ_CALL_LOG) != PERMISSION_GRANTED)
155+
return false;
156156
}
157157
if ((requiredPermissions & PERMISSION_READ_PHONE_STATE) != 0) {
158158
if (BPrefs.get(activity).getBoolean(BPrefs.DUAL_SIM_KEY, BPrefs.DUAL_SIM_DEFAULT_VALUE))
@@ -181,10 +181,6 @@ else if ((requiredPermissions & PERMISSION_NOTIFICATION_LISTENER) == PERMISSION_
181181
* not removing yet, perhaps the issue with google will be solved
182182
*/
183183
static boolean defaultDialerGranted(BaldActivity activity) {
184-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
185-
final TelecomManager telecomManager = (TelecomManager) activity.getSystemService(TELECOM_SERVICE);
186-
return telecomManager != null && Objects.equals(activity.getPackageName(), telecomManager.getDefaultDialerPackage());
187-
}
188184
return true;
189185
}
190186

‎app/src/main/java/com/bald/uriah/baldphone/activities/PermissionActivity.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,13 @@ private void obtainPermissionList() {
162162
new SimplePermissionItem(CALL_PHONE, getString(R.string.calling), getString(R.string.call_subtext)));
163163
}
164164
if ((requiredPermissions & PERMISSION_WRITE_CALL_LOG) != 0 || (requiredPermissions & PERMISSION_READ_CALL_LOG) != 0) {
165-
if (ActivityCompat.checkSelfPermission(this, WRITE_CALL_LOG) != PERMISSION_GRANTED)
166-
permissionItemList.add(
167-
new SimplePermissionItem(WRITE_CALL_LOG, getString(R.string.read_call_log), getString(R.string.read_call_log_subtext)));
168-
else if (ActivityCompat.checkSelfPermission(this, READ_CALL_LOG) != PERMISSION_GRANTED)
169-
permissionItemList.add(
170-
new SimplePermissionItem(READ_CALL_LOG, getString(R.string.read_call_log), getString(R.string.read_call_log_subtext)));
165+
if (!BuildConfig.FLAVOR.equals("gPlay"))
166+
if (ActivityCompat.checkSelfPermission(this, WRITE_CALL_LOG) != PERMISSION_GRANTED)
167+
permissionItemList.add(
168+
new SimplePermissionItem(WRITE_CALL_LOG, getString(R.string.read_call_log), getString(R.string.read_call_log_subtext)));
169+
else if (ActivityCompat.checkSelfPermission(this, READ_CALL_LOG) != PERMISSION_GRANTED)
170+
permissionItemList.add(
171+
new SimplePermissionItem(READ_CALL_LOG, getString(R.string.read_call_log), getString(R.string.read_call_log_subtext)));
171172
}
172173
if ((requiredPermissions & PERMISSION_READ_PHONE_STATE) != 0) {
173174
if (BPrefs.get(this).getBoolean(BPrefs.DUAL_SIM_KEY, BPrefs.DUAL_SIM_DEFAULT_VALUE))

0 commit comments

Comments
 (0)