Skip to content

Commit

Permalink
Merge branch 'development' into pintrest
Browse files Browse the repository at this point in the history
  • Loading branch information
Suneet Srivastava committed Nov 5, 2019
2 parents e0aa001 + 0436c58 commit f44f380
Show file tree
Hide file tree
Showing 12 changed files with 185 additions and 121 deletions.
100 changes: 53 additions & 47 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,30 @@
package="org.fossasia.phimpme">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission
android:name="android.permission.READ_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.RECEIVE_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.SEND_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.WRITE_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.CALL_PHONE"
tools:node="remove" />
<uses-permission
android:name="android.permission.WRITE_CALL_LOG"
tools:node="remove" />
<uses-permission
android:name="android.permission.READ_CALL_LOG"
tools:node="remove" />
<uses-permission
android:name="android.permission.PROCESS_OUTGOING_CALLS"
tools:node="remove" />
<uses-permission
android:name="android.permission.MANAGE_OWN_CALLS"
tools:node="remove" />
<uses-permission
android:name="android.permission.ANSWER_PHONE_CALLS"
tools:node="remove" />
<uses-permission
android:name="android.permission.READ_PHONE_NUMBERS"
tools:node="remove" />

<uses-permission android:name="android.permission.READ_SMS"
tools:node="remove"/>
<uses-permission android:name="android.permission.RECEIVE_SMS"
tools:node="remove"/>
<uses-permission android:name="android.permission.SEND_SMS"
tools:node="remove"/>
<uses-permission android:name="android.permission.WRITE_SMS"
tools:node="remove"/>
<uses-permission android:name="android.permission.CALL_PHONE"
tools:node="remove"/>
<uses-permission android:name="android.permission.WRITE_CALL_LOG"
tools:node="remove"/>
<uses-permission android:name="android.permission.READ_CALL_LOG"
tools:node="remove"/>
<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"
tools:node="remove"/>
<uses-permission android:name="android.permission.MANAGE_OWN_CALLS"
tools:node="remove"/>
<uses-permission android:name="android.permission.ANSWER_PHONE_CALLS"
tools:node="remove"/>
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS"
tools:node="remove"/>

<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
Expand All @@ -55,7 +46,6 @@
android:largeHeap="true"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".share.pinterest.PinterestShareActivity"></activity>

<uses-library
android:name="org.apache.http.legacy"
Expand All @@ -75,6 +65,7 @@
android:scheme="phimp.me" />
</intent-filter>
</activity>

<activity
android:name=".opencamera.Camera.CameraActivity"
android:parentActivityName=".gallery.activities.LFMainActivity"
Expand Down Expand Up @@ -111,7 +102,8 @@
android:icon="@drawable/ic_launcher_take_photo"
android:label="@string/take_photo"
android:screenOrientation="portrait"
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 -->
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 -->
<receiver
android:name=".opencamera.Camera.MyWidgetProvider"
android:icon="@drawable/ic_launcher_vector"
Expand All @@ -127,7 +119,8 @@
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_info" />
</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 -->
</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 -->
<receiver
android:name=".opencamera.Camera.MyWidgetProviderTakePhoto"
android:icon="@drawable/ic_launcher_take_photo"
Expand All @@ -139,7 +132,8 @@
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_info_take_photo" />
</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 -->
</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 -->
<service
android:name=".opencamera.Camera.MyTileService"
android:icon="@drawable/ic_photo_camera_white_48dp"
Expand All @@ -148,7 +142,8 @@
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE" />
</intent-filter>
</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 -->
</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 -->
<service
android:name=".opencamera.Camera.MyTileServiceVideo"
android:icon="@drawable/ic_videocam_white_48dp"
Expand All @@ -157,7 +152,8 @@
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE" />
</intent-filter>
</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 -->
</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 -->
<service
android:name=".opencamera.Camera.MyTileServiceFrontCamera"
android:icon="@drawable/ic_face_white_48dp"
Expand Down Expand Up @@ -220,9 +216,9 @@
android:name=".gallery.activities.SingleMediaActivity"
android:configChanges="orientation|screenSize|uiMode|touchscreen|screenLayout"
android:label="@string/app_name"
android:windowSoftInputMode="adjustPan"
android:parentActivityName=".gallery.activities.LFMainActivity"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:windowSoftInputMode="adjustPan">
android:theme="@style/Theme.AppCompat.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.SEND" />

Expand Down Expand Up @@ -264,9 +260,9 @@
<activity
android:name=".gallery.activities.SettingsActivity"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="adjustNothing"
android:label="@string/settings"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:windowSoftInputMode="adjustNothing">
android:theme="@style/Theme.AppCompat.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.SETTING" />

Expand All @@ -278,11 +274,14 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".gallery.activities.AboutActivity"
android:configChanges="orientation|screenSize"
android:label="@string/about"
android:theme="@style/Theme.AppCompat.NoActionBar" />
android:theme="@style/Theme.AppCompat.NoActionBar">
</activity>

<activity
android:name=".gallery.activities.ExcludedAlbumsActivity"
android:label="@string/excluded_albums"
Expand All @@ -296,7 +295,10 @@
<activity
android:name=".editor.EditImageActivity"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />

android:windowSoftInputMode="adjustPan"
/>

<activity
android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="portrait"
Expand Down Expand Up @@ -330,6 +332,7 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustNothing" />

<activity
android:name=".accounts.AccountActivity"
android:launchMode="singleTask"
Expand Down Expand Up @@ -396,7 +399,10 @@

<activity android:name=".editor.CompressImageActivity" />
<activity android:name=".trashbin.TrashBinActivity" />
<activity android:name=".share.pinterest.PinterestAuthActivity" />
<activity android:name=".share.pinterest.PinterestAuthActivity"
android:screenOrientation="portrait" />
<activity android:name=".share.pinterest.PinterestShareActivity"
android:screenOrientation="portrait"/>
</application>

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/phimpme/MyApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.os.StrictMode;
import android.util.Log;
import androidx.multidex.MultiDex;

import com.squareup.leakcanary.LeakCanary;
import com.squareup.leakcanary.RefWatcher;
import com.twitter.sdk.android.core.DefaultLogger;
Expand Down Expand Up @@ -55,6 +54,7 @@ public void onCreate() {
.debug(true)
.build();
Twitter.initialize(config);

/** Realm initialization */
Realm.init(this);
RealmConfiguration realmConfiguration =
Expand Down
Loading

0 comments on commit f44f380

Please sign in to comment.