Skip to content

Commit f44f380

Browse files
author
Suneet Srivastava
committed
Merge branch 'development' into pintrest
2 parents e0aa001 + 0436c58 commit f44f380

File tree

12 files changed

+185
-121
lines changed

12 files changed

+185
-121
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,30 @@
44
package="org.fossasia.phimpme">
55

66
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
7-
<uses-permission
8-
android:name="android.permission.READ_SMS"
9-
tools:node="remove" />
10-
<uses-permission
11-
android:name="android.permission.RECEIVE_SMS"
12-
tools:node="remove" />
13-
<uses-permission
14-
android:name="android.permission.SEND_SMS"
15-
tools:node="remove" />
16-
<uses-permission
17-
android:name="android.permission.WRITE_SMS"
18-
tools:node="remove" />
19-
<uses-permission
20-
android:name="android.permission.CALL_PHONE"
21-
tools:node="remove" />
22-
<uses-permission
23-
android:name="android.permission.WRITE_CALL_LOG"
24-
tools:node="remove" />
25-
<uses-permission
26-
android:name="android.permission.READ_CALL_LOG"
27-
tools:node="remove" />
28-
<uses-permission
29-
android:name="android.permission.PROCESS_OUTGOING_CALLS"
30-
tools:node="remove" />
31-
<uses-permission
32-
android:name="android.permission.MANAGE_OWN_CALLS"
33-
tools:node="remove" />
34-
<uses-permission
35-
android:name="android.permission.ANSWER_PHONE_CALLS"
36-
tools:node="remove" />
37-
<uses-permission
38-
android:name="android.permission.READ_PHONE_NUMBERS"
39-
tools:node="remove" />
7+
8+
<uses-permission android:name="android.permission.READ_SMS"
9+
tools:node="remove"/>
10+
<uses-permission android:name="android.permission.RECEIVE_SMS"
11+
tools:node="remove"/>
12+
<uses-permission android:name="android.permission.SEND_SMS"
13+
tools:node="remove"/>
14+
<uses-permission android:name="android.permission.WRITE_SMS"
15+
tools:node="remove"/>
16+
<uses-permission android:name="android.permission.CALL_PHONE"
17+
tools:node="remove"/>
18+
<uses-permission android:name="android.permission.WRITE_CALL_LOG"
19+
tools:node="remove"/>
20+
<uses-permission android:name="android.permission.READ_CALL_LOG"
21+
tools:node="remove"/>
22+
<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"
23+
tools:node="remove"/>
24+
<uses-permission android:name="android.permission.MANAGE_OWN_CALLS"
25+
tools:node="remove"/>
26+
<uses-permission android:name="android.permission.ANSWER_PHONE_CALLS"
27+
tools:node="remove"/>
28+
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS"
29+
tools:node="remove"/>
30+
4031
<uses-permission android:name="android.permission.CAMERA" />
4132
<uses-permission android:name="android.permission.RECORD_AUDIO" />
4233
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -55,7 +46,6 @@
5546
android:largeHeap="true"
5647
android:supportsRtl="true"
5748
android:theme="@style/AppTheme">
58-
<activity android:name=".share.pinterest.PinterestShareActivity"></activity>
5949

6050
<uses-library
6151
android:name="org.apache.http.legacy"
@@ -75,6 +65,7 @@
7565
android:scheme="phimp.me" />
7666
</intent-filter>
7767
</activity>
68+
7869
<activity
7970
android:name=".opencamera.Camera.CameraActivity"
8071
android:parentActivityName=".gallery.activities.LFMainActivity"
@@ -111,7 +102,8 @@
111102
android:icon="@drawable/ic_launcher_take_photo"
112103
android:label="@string/take_photo"
113104
android:screenOrientation="portrait"
114-
android:taskAffinity="" /> <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
105+
android:taskAffinity="" />
106+
<!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
115107
<receiver
116108
android:name=".opencamera.Camera.MyWidgetProvider"
117109
android:icon="@drawable/ic_launcher_vector"
@@ -127,7 +119,8 @@
127119
<meta-data
128120
android:name="android.appwidget.provider"
129121
android:resource="@xml/widget_info" />
130-
</receiver> <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
122+
</receiver>
123+
<!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
131124
<receiver
132125
android:name=".opencamera.Camera.MyWidgetProviderTakePhoto"
133126
android:icon="@drawable/ic_launcher_take_photo"
@@ -139,7 +132,8 @@
139132
<meta-data
140133
android:name="android.appwidget.provider"
141134
android:resource="@xml/widget_info_take_photo" />
142-
</receiver> <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
135+
</receiver>
136+
<!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
143137
<service
144138
android:name=".opencamera.Camera.MyTileService"
145139
android:icon="@drawable/ic_photo_camera_white_48dp"
@@ -148,7 +142,8 @@
148142
<intent-filter>
149143
<action android:name="android.service.quicksettings.action.QS_TILE" />
150144
</intent-filter>
151-
</service> <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
145+
</service>
146+
<!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
152147
<service
153148
android:name=".opencamera.Camera.MyTileServiceVideo"
154149
android:icon="@drawable/ic_videocam_white_48dp"
@@ -157,7 +152,8 @@
157152
<intent-filter>
158153
<action android:name="android.service.quicksettings.action.QS_TILE" />
159154
</intent-filter>
160-
</service> <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
155+
</service>
156+
<!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
161157
<service
162158
android:name=".opencamera.Camera.MyTileServiceFrontCamera"
163159
android:icon="@drawable/ic_face_white_48dp"
@@ -220,9 +216,9 @@
220216
android:name=".gallery.activities.SingleMediaActivity"
221217
android:configChanges="orientation|screenSize|uiMode|touchscreen|screenLayout"
222218
android:label="@string/app_name"
219+
android:windowSoftInputMode="adjustPan"
223220
android:parentActivityName=".gallery.activities.LFMainActivity"
224-
android:theme="@style/Theme.AppCompat.NoActionBar"
225-
android:windowSoftInputMode="adjustPan">
221+
android:theme="@style/Theme.AppCompat.NoActionBar">
226222
<intent-filter>
227223
<action android:name="android.intent.action.SEND" />
228224

@@ -264,9 +260,9 @@
264260
<activity
265261
android:name=".gallery.activities.SettingsActivity"
266262
android:configChanges="orientation|screenSize"
263+
android:windowSoftInputMode="adjustNothing"
267264
android:label="@string/settings"
268-
android:theme="@style/Theme.AppCompat.NoActionBar"
269-
android:windowSoftInputMode="adjustNothing">
265+
android:theme="@style/Theme.AppCompat.NoActionBar">
270266
<intent-filter>
271267
<action android:name="android.intent.action.SETTING" />
272268

@@ -278,11 +274,14 @@
278274
<category android:name="android.intent.category.DEFAULT" />
279275
</intent-filter>
280276
</activity>
277+
281278
<activity
282279
android:name=".gallery.activities.AboutActivity"
283280
android:configChanges="orientation|screenSize"
284281
android:label="@string/about"
285-
android:theme="@style/Theme.AppCompat.NoActionBar" />
282+
android:theme="@style/Theme.AppCompat.NoActionBar">
283+
</activity>
284+
286285
<activity
287286
android:name=".gallery.activities.ExcludedAlbumsActivity"
288287
android:label="@string/excluded_albums"
@@ -296,7 +295,10 @@
296295
<activity
297296
android:name=".editor.EditImageActivity"
298297
android:theme="@style/AppTheme.NoActionBar"
299-
android:windowSoftInputMode="adjustPan" />
298+
299+
android:windowSoftInputMode="adjustPan"
300+
/>
301+
300302
<activity
301303
android:name="com.yalantis.ucrop.UCropActivity"
302304
android:screenOrientation="portrait"
@@ -330,6 +332,7 @@
330332
android:screenOrientation="portrait"
331333
android:theme="@style/AppTheme.NoActionBar"
332334
android:windowSoftInputMode="adjustNothing" />
335+
333336
<activity
334337
android:name=".accounts.AccountActivity"
335338
android:launchMode="singleTask"
@@ -396,7 +399,10 @@
396399

397400
<activity android:name=".editor.CompressImageActivity" />
398401
<activity android:name=".trashbin.TrashBinActivity" />
399-
<activity android:name=".share.pinterest.PinterestAuthActivity" />
402+
<activity android:name=".share.pinterest.PinterestAuthActivity"
403+
android:screenOrientation="portrait" />
404+
<activity android:name=".share.pinterest.PinterestShareActivity"
405+
android:screenOrientation="portrait"/>
400406
</application>
401407

402-
</manifest>
408+
</manifest>

‎app/src/main/java/org/fossasia/phimpme/MyApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.os.StrictMode;
66
import android.util.Log;
77
import androidx.multidex.MultiDex;
8-
98
import com.squareup.leakcanary.LeakCanary;
109
import com.squareup.leakcanary.RefWatcher;
1110
import com.twitter.sdk.android.core.DefaultLogger;
@@ -55,6 +54,7 @@ public void onCreate() {
5554
.debug(true)
5655
.build();
5756
Twitter.initialize(config);
57+
5858
/** Realm initialization */
5959
Realm.init(this);
6060
RealmConfiguration realmConfiguration =

0 commit comments

Comments
 (0)