From 7ecc5e9fc1a1c9041182cee1a4505060a5227cbe Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Sat, 7 Feb 2015 20:56:49 +0100
Subject: [PATCH] Start adding ask permission dialog

---
 AndroidManifest.xml                           |  5 ++
 build.gradle                                  |  2 +
 res/layout/ask_permission.xml                 | 46 +++++++++++++++++++
 .../{login_base.xml => login_assistant.xml}   |  2 +-
 ...oading.xml => login_assistant_loading.xml} |  0
 .../gms/auth/AskPermissionActivity.java       | 30 ++++++++++++
 src/org/microg/gms/auth/AuthManager.java      |  6 +++
 ...seActivity.java => AssistantActivity.java} |  4 +-
 .../microg/gms/auth/login/LoginActivity.java  |  2 +-
 9 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 res/layout/ask_permission.xml
 rename res/layout/{login_base.xml => login_assistant.xml} (97%)
 rename res/layout/{login_loading.xml => login_assistant_loading.xml} (100%)
 create mode 100644 src/org/microg/gms/auth/AskPermissionActivity.java
 rename src/org/microg/gms/auth/login/{BaseActivity.java => AssistantActivity.java} (94%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0ae66739..a4b52dbb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -113,6 +113,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="org.microg.gms.auth.AskPermissionActivity"
+            android:theme="@style/Theme.AppCompat.Light.Dialog"
+            android:exported="true" />
+
         <provider
             android:name="org.microg.gms.feeds.SubscribedFeedsProvider"
             android:authorities="subscribedfeeds"
diff --git a/build.gradle b/build.gradle
index a6da2811..8d289114 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,6 +36,8 @@ dependencies {
     compile 'com.android.support:support-v4:21.0.3'
     compile 'com.android.support:appcompat-v7:21.0.3'
 
+    compile 'de.hdodenhof:circleimageview:1.2.1'
+
     compile project(':GmsApi')
     compile project(':UnifiedNlpLib')
 
diff --git a/res/layout/ask_permission.xml b/res/layout/ask_permission.xml
new file mode 100644
index 00000000..d03e7aad
--- /dev/null
+++ b/res/layout/ask_permission.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2013-2015 µg Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:padding="50dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:src="@color/login_blue_theme_accent"
+            android:id="@+id/account_photo"
+            android:layout_marginRight="-5dp"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            app:border_width="1dp"
+            app:border_color="?attr/colorControlHighlight"/>
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:src="@color/login_blue_theme_primary"
+            android:id="@+id/app_icon"
+            android:layout_marginLeft="-5dp"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            app:border_width="1dp"
+            app:border_color="?attr/colorControlHighlight"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/login_base.xml b/res/layout/login_assistant.xml
similarity index 97%
rename from res/layout/login_base.xml
rename to res/layout/login_assistant.xml
index 45fb73ca..e9a78e70 100644
--- a/res/layout/login_base.xml
+++ b/res/layout/login_assistant.xml
@@ -50,7 +50,7 @@
             android:layout_height="0dip"
             android:layout_weight="1">
 
-            <include layout="@layout/login_loading" />
+            <include layout="@layout/login_assistant_loading" />
         </FrameLayout>
 
         <View
diff --git a/res/layout/login_loading.xml b/res/layout/login_assistant_loading.xml
similarity index 100%
rename from res/layout/login_loading.xml
rename to res/layout/login_assistant_loading.xml
diff --git a/src/org/microg/gms/auth/AskPermissionActivity.java b/src/org/microg/gms/auth/AskPermissionActivity.java
new file mode 100644
index 00000000..0f9bcd05
--- /dev/null
+++ b/src/org/microg/gms/auth/AskPermissionActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2013-2015 µg Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.microg.gms.auth;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import com.google.android.gms.R;
+
+public class AskPermissionActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.ask_permission);
+    }
+}
diff --git a/src/org/microg/gms/auth/AuthManager.java b/src/org/microg/gms/auth/AuthManager.java
index 8171d5b8..b0e8f2c8 100644
--- a/src/org/microg/gms/auth/AuthManager.java
+++ b/src/org/microg/gms/auth/AuthManager.java
@@ -60,6 +60,12 @@ public class AuthManager {
         return true;
     }
 
+    public static void storePermission(Context context, Account account, String packageName,
+                                       String sig, String service) {
+        AccountManager accountManager = AccountManager.get(context);
+        accountManager.setUserData(account, buildPermKey(packageName, sig, service), "1");
+    }
+
     private static String buildTokenKey(String packageName, String sig, String service) {
         return packageName + ":" + sig + ":" + service;
     }
diff --git a/src/org/microg/gms/auth/login/BaseActivity.java b/src/org/microg/gms/auth/login/AssistantActivity.java
similarity index 94%
rename from src/org/microg/gms/auth/login/BaseActivity.java
rename to src/org/microg/gms/auth/login/AssistantActivity.java
index b0f75c5a..44857006 100644
--- a/src/org/microg/gms/auth/login/BaseActivity.java
+++ b/src/org/microg/gms/auth/login/AssistantActivity.java
@@ -23,14 +23,14 @@ import android.util.DisplayMetrics;
 
 import com.google.android.gms.R;
 
-public abstract class BaseActivity extends Activity {
+public abstract class AssistantActivity extends Activity {
     private static final int TITLE_MIN_HEIGHT = 64;
     private static final double TITLE_WIDTH_FACTOR = (8.0 / 18.0);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.login_base);
+        setContentView(R.layout.login_assistant);
         formatTitle();
     }
 
diff --git a/src/org/microg/gms/auth/login/LoginActivity.java b/src/org/microg/gms/auth/login/LoginActivity.java
index 2b8deb80..8541f36e 100644
--- a/src/org/microg/gms/auth/login/LoginActivity.java
+++ b/src/org/microg/gms/auth/login/LoginActivity.java
@@ -46,7 +46,7 @@ import org.microg.gms.common.Utils;
 
 import java.util.Locale;
 
-public class LoginActivity extends BaseActivity {
+public class LoginActivity extends AssistantActivity {
     public static final String TMPL_NEW_ACCOUNT = "new_account";
     public static final String EXTRA_TMPL = "tmpl";
     public static final String EXTRA_EMAIL = "email";