Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d82521d7 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '215-edrive-upgrade-privacy' into 'v1-oreo' 

eDrive: Change link for auto login during upgrading plan

See merge request !114
parents fb1c2324 e3f639b3

app/src/main/java/foundation/e/drive/activity/AccountsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class AccountsActivity extends AppCompatActivity { 
            public void onClick(View v) {

                final Intent upgradeIntent = buildIntent(Intent.ACTION_VIEW,

                        String.format(EDriveWidget.WEBPAGE, userInfo.id,

                                client.getCredentials().getAuthToken(), dataForWeb(userInfo.quota.total)));

                                dataForWeb(userInfo.quota.total)));

                startActivity(upgradeIntent);

            }

        });

app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import foundation.e.drive.utils.CommonUtils; 
 */

public class EDriveWidget extends AppWidgetProvider {

    public static final String WEBPAGE =

            "https://esolutions.shop/ecloud-subscriptions/?username=%s&token=%s&current-quota=%s&from=nextcloud";

            "https://esolutions.shop/ecloud-subscriptions/?username=%s&token=placeholder&current-quota=%s&from=wp";

    public static final String ACCOUNT_MANAGER_PACKAGE_NAME = "foundation.e.accountmanager";

    private static final String ADD_ACCOUNT_WEBPAGE = "https://e.foundation/e-email-invite/";

    private static final String GET_ACCOUNT_MANAGER_COMPONENT_NAME = ACCOUNT_MANAGER_PACKAGE_NAME +
@@ -276,7 +276,7 @@ public class EDriveWidget extends AppWidgetProvider { 


        final PendingIntent pendingIntentUpgrade = PendingIntent.getActivity(context, 0,

                buildIntent(Intent.ACTION_VIEW, String.format(WEBPAGE, userInfo.id,

                        client.getCredentials().getAuthToken(), dataForWeb(userInfo.quota.total))),

                        dataForWeb(userInfo.quota.total))),

                PendingIntent.FLAG_IMMUTABLE);

        views.setOnClickPendingIntent(R.id.upgrade, pendingIntentUpgrade);

    }